From f419dcd08075c4cf6393e7a7a5f243f38367f69e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 18:28:44 +0100 Subject: [PATCH 01/76] Switch to IntelliJ --- .gitignore | 0 LICENSE.md | 0 README.md | 0 build.gradle | 0 gradlew | 0 gradlew.bat | 0 logo.png | Bin screenshots/crafting_grid.png | Bin screenshots/interface.png | Bin screenshots/overview.png | Bin screenshots/relays.png | Bin screenshots/storage_block.png | Bin src/main/java/cofh/api/CoFHAPIProps.java | 0 .../java/cofh/api/energy/EnergyStorage.java | 0 .../cofh/api/energy/IEnergyConnection.java | 0 .../cofh/api/energy/IEnergyContainerItem.java | 0 .../java/cofh/api/energy/IEnergyHandler.java | 0 .../java/cofh/api/energy/IEnergyProvider.java | 0 .../java/cofh/api/energy/IEnergyReceiver.java | 0 .../java/cofh/api/energy/IEnergyStorage.java | 0 .../cofh/api/energy/ItemEnergyContainer.java | 0 .../cofh/api/energy/TileEnergyHandler.java | 0 .../java/cofh/api/energy/package-info.java | 0 src/main/java/cofh/api/package-info.java | 0 .../java/refinedstorage/RefinedStorage.java | 67 +- .../refinedstorage/RefinedStorageBlocks.java | 35 +- .../refinedstorage/RefinedStorageGui.java | 29 +- .../refinedstorage/RefinedStorageItems.java | 19 +- .../java/refinedstorage/block/BlockBase.java | 158 ++-- .../java/refinedstorage/block/BlockCable.java | 126 ++- .../block/BlockConstructor.java | 35 +- .../refinedstorage/block/BlockController.java | 142 ++-- .../refinedstorage/block/BlockDestructor.java | 35 +- .../refinedstorage/block/BlockDetector.java | 103 ++- .../java/refinedstorage/block/BlockDrive.java | 35 +- .../refinedstorage/block/BlockExporter.java | 35 +- .../block/BlockExternalStorage.java | 35 +- .../java/refinedstorage/block/BlockGrid.java | 91 +- .../refinedstorage/block/BlockImporter.java | 35 +- .../refinedstorage/block/BlockInterface.java | 35 +- .../refinedstorage/block/BlockMachine.java | 49 +- .../block/BlockMachineCasing.java | 10 +- .../java/refinedstorage/block/BlockRelay.java | 35 +- .../refinedstorage/block/BlockSolderer.java | 35 +- .../refinedstorage/block/BlockStorage.java | 159 ++-- .../block/BlockWirelessTransmitter.java | 67 +- .../block/EnumControllerType.java | 45 +- .../refinedstorage/block/EnumGridType.java | 45 +- .../refinedstorage/block/EnumStorageType.java | 81 +- .../container/ContainerBase.java | 196 ++--- .../container/ContainerConstructor.java | 35 +- .../container/ContainerController.java | 12 +- .../container/ContainerDestructor.java | 12 +- .../container/ContainerDetector.java | 14 +- .../container/ContainerDrive.java | 24 +- .../container/ContainerExporter.java | 19 +- .../container/ContainerGrid.java | 45 +- .../container/ContainerImporter.java | 19 +- .../container/ContainerInterface.java | 84 +- .../container/ContainerRelay.java | 12 +- .../container/ContainerSolderer.java | 78 +- .../container/ContainerStorage.java | 19 +- .../ContainerWirelessTransmitter.java | 69 +- .../container/slot/BasicItemValidator.java | 21 +- .../container/slot/IItemValidator.java | 5 +- .../container/slot/SlotDisabled.java | 19 +- .../container/slot/SlotFiltered.java | 23 +- .../slot/SlotGridCraftingResult.java | 43 +- .../container/slot/SlotOutput.java | 19 +- .../container/slot/SlotSpecimen.java | 55 +- src/main/java/refinedstorage/gui/GuiBase.java | 312 ++++--- .../refinedstorage/gui/GuiConstructor.java | 56 +- .../refinedstorage/gui/GuiController.java | 149 ++-- .../refinedstorage/gui/GuiDestructor.java | 52 +- .../java/refinedstorage/gui/GuiDetector.java | 104 ++- .../java/refinedstorage/gui/GuiExporter.java | 56 +- src/main/java/refinedstorage/gui/GuiGrid.java | 480 +++++------ .../java/refinedstorage/gui/GuiHandler.java | 148 ++-- .../java/refinedstorage/gui/GuiImporter.java | 58 +- .../java/refinedstorage/gui/GuiInterface.java | 71 +- .../java/refinedstorage/gui/GuiRelay.java | 52 +- .../java/refinedstorage/gui/GuiSolderer.java | 59 +- .../java/refinedstorage/gui/GuiStorage.java | 164 ++-- .../gui/GuiWirelessTransmitter.java | 70 +- .../java/refinedstorage/gui/Scrollbar.java | 151 ++-- .../gui/sidebutton/SideButton.java | 57 +- .../gui/sidebutton/SideButtonCompare.java | 79 +- .../sidebutton/SideButtonDetectorMode.java | 45 +- .../SideButtonGridSortingDirection.java | 62 +- .../sidebutton/SideButtonGridSortingType.java | 62 +- .../gui/sidebutton/SideButtonMode.java | 62 +- .../sidebutton/SideButtonRedstoneMode.java | 47 +- .../inventory/InventorySimple.java | 233 +++--- .../java/refinedstorage/item/ItemBase.java | 39 +- .../refinedstorage/item/ItemBlockBase.java | 19 +- .../item/ItemBlockController.java | 10 +- .../refinedstorage/item/ItemBlockGrid.java | 10 +- .../refinedstorage/item/ItemBlockStorage.java | 66 +- .../java/refinedstorage/item/ItemCore.java | 35 +- .../refinedstorage/item/ItemProcessor.java | 45 +- .../item/ItemQuartzEnrichedIron.java | 10 +- .../java/refinedstorage/item/ItemSilicon.java | 10 +- .../refinedstorage/item/ItemStorageCell.java | 74 +- .../refinedstorage/item/ItemStoragePart.java | 39 +- .../refinedstorage/item/ItemWirelessGrid.java | 176 ++-- .../item/ItemWirelessGridPlate.java | 12 +- .../jei/PluginRefinedStorage.java | 22 +- .../jei/SoldererRecipeCategory.java | 91 +- .../jei/SoldererRecipeHandler.java | 39 +- .../jei/SoldererRecipeMaker.java | 34 +- .../jei/SoldererRecipeWrapper.java | 107 ++- .../network/MessageCompareUpdate.java | 75 +- .../network/MessageDetectorAmountUpdate.java | 75 +- .../network/MessageDetectorModeUpdate.java | 90 +- .../network/MessageGridCraftingClear.java | 91 +- .../network/MessageGridCraftingUpdate.java | 109 ++- .../network/MessageGridSortingUpdate.java | 95 +-- .../network/MessageHandlerPlayerToServer.java | 30 +- .../network/MessageModeToggle.java | 80 +- .../network/MessagePriorityUpdate.java | 87 +- .../network/MessageRedstoneModeUpdate.java | 69 +- .../network/MessageStoragePull.java | 161 ++-- .../network/MessageStoragePush.java | 150 ++-- .../network/MessageTileUpdate.java | 79 +- .../refinedstorage/proxy/ClientProxy.java | 203 +++-- .../refinedstorage/proxy/CommonProxy.java | 614 +++++++------- .../refinedstorage/proxy/ServerProxy.java | 3 +- .../refinedstorage/storage/CellStorage.java | 62 +- .../java/refinedstorage/storage/IStorage.java | 16 +- .../refinedstorage/storage/IStorageGui.java | 21 +- .../storage/IStorageProvider.java | 5 +- .../refinedstorage/storage/NBTStorage.java | 209 +++-- .../refinedstorage/storage/StorageItem.java | 288 +++---- .../refinedstorage/tile/INetworkTile.java | 9 +- .../java/refinedstorage/tile/TileBase.java | 108 ++- .../java/refinedstorage/tile/TileCable.java | 104 +-- .../refinedstorage/tile/TileConstructor.java | 126 ++- .../refinedstorage/tile/TileController.java | 780 ++++++++---------- .../refinedstorage/tile/TileDestructor.java | 54 +- .../refinedstorage/tile/TileDetector.java | 307 +++---- .../java/refinedstorage/tile/TileDrive.java | 504 +++++------ .../refinedstorage/tile/TileExporter.java | 186 ++--- .../tile/TileExternalStorage.java | 421 +++++----- .../java/refinedstorage/tile/TileGrid.java | 255 +++--- .../refinedstorage/tile/TileImporter.java | 283 +++---- .../refinedstorage/tile/TileInterface.java | 448 +++++----- .../java/refinedstorage/tile/TileMachine.java | 207 +++-- .../java/refinedstorage/tile/TileRelay.java | 26 +- .../refinedstorage/tile/TileSolderer.java | 419 +++++----- .../java/refinedstorage/tile/TileStorage.java | 396 ++++----- .../tile/TileWirelessTransmitter.java | 380 ++++----- .../tile/settings/ICompareSetting.java | 9 +- .../tile/settings/IModeSetting.java | 13 +- .../tile/settings/IRedstoneModeSetting.java | 9 +- .../tile/settings/ModeSettingUtils.java | 60 +- .../tile/settings/RedstoneMode.java | 79 +- .../tile/solderer/ISoldererRecipe.java | 9 +- .../solderer/SoldererRecipeCraftingGrid.java | 49 +- .../tile/solderer/SoldererRecipeDrive.java | 49 +- .../solderer/SoldererRecipeInterface.java | 49 +- .../SoldererRecipePrintedProcessor.java | 86 +- .../solderer/SoldererRecipeProcessor.java | 90 +- .../tile/solderer/SoldererRecipeStorage.java | 62 +- .../solderer/SoldererRecipeWirelessGrid.java | 58 +- .../tile/solderer/SoldererRegistry.java | 81 +- .../refinedstorage/util/InventoryUtils.java | 366 ++++---- .../refinedstorage/blockstates/cable.json | 0 .../blockstates/constructor.json | 0 .../blockstates/controller.json | 0 .../blockstates/destructor.json | 0 .../refinedstorage/blockstates/detector.json | 0 .../refinedstorage/blockstates/drive.json | 0 .../refinedstorage/blockstates/exporter.json | 0 .../blockstates/external_storage.json | 0 .../refinedstorage/blockstates/grid.json | 0 .../refinedstorage/blockstates/importer.json | 0 .../refinedstorage/blockstates/interface.json | 0 .../blockstates/machine_casing.json | 0 .../refinedstorage/blockstates/relay.json | 0 .../refinedstorage/blockstates/solderer.json | 0 .../refinedstorage/blockstates/storage.json | 0 .../blockstates/wireless_transmitter.json | 0 .../assets/refinedstorage/lang/en_US.lang | 0 .../assets/refinedstorage/lang/nl_NL.lang | 0 .../refinedstorage/models/block/cable.json | 0 .../models/block/cable_core.json | 0 .../models/block/cable_down.json | 0 .../models/block/cable_east.json | 0 .../models/block/cable_north.json | 0 .../models/block/cable_south.json | 0 .../refinedstorage/models/block/cable_up.json | 0 .../models/block/cable_west.json | 0 .../models/item/16k_storage_cell.json | 0 .../models/item/16k_storage_part.json | 0 .../models/item/1k_storage_cell.json | 0 .../models/item/1k_storage_part.json | 0 .../models/item/4k_storage_cell.json | 0 .../models/item/4k_storage_part.json | 0 .../models/item/64k_storage_cell.json | 0 .../models/item/64k_storage_part.json | 0 .../item/advanced_printed_processor.json | 0 .../models/item/advanced_processor.json | 0 .../models/item/basic_printed_processor.json | 0 .../models/item/basic_processor.json | 0 .../models/item/blank_pattern.json | 0 .../models/item/construction_core.json | 0 .../models/item/creative_storage_cell.json | 0 .../models/item/destruction_core.json | 0 .../item/improved_printed_processor.json | 0 .../models/item/improved_processor.json | 0 .../models/item/printed_silicon.json | 0 .../models/item/quartz_enriched_iron.json | 0 .../refinedstorage/models/item/silicon.json | 0 .../models/item/wireless_grid_connected.json | 0 .../item/wireless_grid_disconnected.json | 0 .../models/item/wireless_grid_plate.json | 0 .../textures/blocks/16k_storage_block.png | Bin .../textures/blocks/1k_storage_block.png | Bin .../textures/blocks/4k_storage_block.png | Bin .../textures/blocks/64k_storage_block.png | Bin .../textures/blocks/constructor_connected.png | Bin .../blocks/constructor_disconnected.png | Bin .../textures/blocks/controller_0.png | Bin .../textures/blocks/controller_7.png | Bin .../textures/blocks/controller_8.png | Bin .../blocks/creative_storage_block.png | Bin .../textures/blocks/destructor_connected.png | Bin .../blocks/destructor_disconnected.png | Bin .../textures/blocks/detector_powered.png | Bin .../textures/blocks/detector_unpowered.png | Bin .../textures/blocks/interface.png | Bin .../textures/blocks/relay_connected.png | Bin .../textures/blocks/relay_disconnected.png | Bin .../textures/blocks/solderer_connected.png | Bin .../textures/blocks/solderer_disconnected.png | Bin .../textures/blocks/wireless_transmitter.png | Bin .../blocks/wireless_transmitter_side.png | Bin .../wireless_transmitter_side_working.png | Bin .../blocks/wireless_transmitter_working.png | Bin .../textures/gui/constructor.png | Bin .../textures/gui/controller.png | Bin .../textures/gui/crafting_grid.png | Bin .../textures/gui/destructor.png | Bin .../refinedstorage/textures/gui/drive.png | Bin .../refinedstorage/textures/gui/interface.png | Bin .../refinedstorage/textures/gui/relay.png | Bin .../refinedstorage/textures/gui/solderer.png | Bin .../refinedstorage/textures/gui/storage.png | Bin .../textures/gui/wireless_transmitter.png | Bin .../assets/refinedstorage/textures/icons.png | Bin .../textures/items/16k_storage_cell.png | Bin .../textures/items/16k_storage_part.png | Bin .../textures/items/1k_storage_cell.png | Bin .../textures/items/1k_storage_part.png | Bin .../textures/items/4k_storage_cell.png | Bin .../textures/items/4k_storage_part.png | Bin .../textures/items/64k_storage_cell.png | Bin .../textures/items/64k_storage_part.png | Bin .../items/advanced_printed_processor.png | Bin .../textures/items/advanced_processor.png | Bin .../items/basic_printed_processor.png | Bin .../textures/items/basic_processor.png | Bin .../textures/items/blank_pattern.png | Bin .../textures/items/construction_core.png | Bin .../textures/items/creative_storage_cell.png | Bin .../textures/items/destruction_core.png | Bin .../items/improved_printed_processor.png | Bin .../textures/items/improved_processor.png | Bin .../textures/items/printed_silicon.png | Bin .../textures/items/quartz_enriched_iron.png | Bin .../refinedstorage/textures/items/silicon.png | Bin .../items/wireless_grid_connected.png | Bin .../items/wireless_grid_disconnected.png | Bin .../textures/items/wireless_grid_plate.png | Bin src/main/resources/mcmod.info | 0 275 files changed, 6466 insertions(+), 8059 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE.md mode change 100644 => 100755 README.md mode change 100644 => 100755 build.gradle mode change 100644 => 100755 gradlew mode change 100644 => 100755 gradlew.bat mode change 100644 => 100755 logo.png mode change 100644 => 100755 screenshots/crafting_grid.png mode change 100644 => 100755 screenshots/interface.png mode change 100644 => 100755 screenshots/overview.png mode change 100644 => 100755 screenshots/relays.png mode change 100644 => 100755 screenshots/storage_block.png mode change 100644 => 100755 src/main/java/cofh/api/CoFHAPIProps.java mode change 100644 => 100755 src/main/java/cofh/api/energy/EnergyStorage.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyConnection.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyContainerItem.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyHandler.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyProvider.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyReceiver.java mode change 100644 => 100755 src/main/java/cofh/api/energy/IEnergyStorage.java mode change 100644 => 100755 src/main/java/cofh/api/energy/ItemEnergyContainer.java mode change 100644 => 100755 src/main/java/cofh/api/energy/TileEnergyHandler.java mode change 100644 => 100755 src/main/java/cofh/api/energy/package-info.java mode change 100644 => 100755 src/main/java/cofh/api/package-info.java mode change 100644 => 100755 src/main/java/refinedstorage/RefinedStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/RefinedStorageBlocks.java mode change 100644 => 100755 src/main/java/refinedstorage/RefinedStorageGui.java mode change 100644 => 100755 src/main/java/refinedstorage/RefinedStorageItems.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockBase.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockCable.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockConstructor.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockController.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockDestructor.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockDetector.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockDrive.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockExporter.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockExternalStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockImporter.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockInterface.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockMachine.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockMachineCasing.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockRelay.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockSolderer.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/block/BlockWirelessTransmitter.java mode change 100644 => 100755 src/main/java/refinedstorage/block/EnumControllerType.java mode change 100644 => 100755 src/main/java/refinedstorage/block/EnumGridType.java mode change 100644 => 100755 src/main/java/refinedstorage/block/EnumStorageType.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerBase.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerConstructor.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerController.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerDestructor.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerDetector.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerDrive.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerExporter.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerImporter.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerInterface.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerRelay.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerSolderer.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/BasicItemValidator.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/IItemValidator.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/SlotDisabled.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/SlotFiltered.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/SlotOutput.java mode change 100644 => 100755 src/main/java/refinedstorage/container/slot/SlotSpecimen.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiBase.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiConstructor.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiController.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiDestructor.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiDetector.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiExporter.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiHandler.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiImporter.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiInterface.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiRelay.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiSolderer.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/Scrollbar.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButton.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java mode change 100644 => 100755 src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java mode change 100644 => 100755 src/main/java/refinedstorage/inventory/InventorySimple.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemBase.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemBlockBase.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemBlockController.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemBlockGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemBlockStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemCore.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemProcessor.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemSilicon.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemStorageCell.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemStoragePart.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemWirelessGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/item/ItemWirelessGridPlate.java mode change 100644 => 100755 src/main/java/refinedstorage/jei/PluginRefinedStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/jei/SoldererRecipeCategory.java mode change 100644 => 100755 src/main/java/refinedstorage/jei/SoldererRecipeHandler.java mode change 100644 => 100755 src/main/java/refinedstorage/jei/SoldererRecipeMaker.java mode change 100644 => 100755 src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageCompareUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageGridCraftingClear.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageGridSortingUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageModeToggle.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessagePriorityUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageStoragePull.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageStoragePush.java mode change 100644 => 100755 src/main/java/refinedstorage/network/MessageTileUpdate.java mode change 100644 => 100755 src/main/java/refinedstorage/proxy/ClientProxy.java mode change 100644 => 100755 src/main/java/refinedstorage/proxy/CommonProxy.java mode change 100644 => 100755 src/main/java/refinedstorage/proxy/ServerProxy.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/CellStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/IStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/IStorageGui.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/IStorageProvider.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/NBTStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/storage/StorageItem.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/INetworkTile.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileBase.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileCable.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileConstructor.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileController.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileDestructor.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileDetector.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileDrive.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileExporter.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileExternalStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileImporter.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileInterface.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileMachine.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileRelay.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileSolderer.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/TileWirelessTransmitter.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/settings/ICompareSetting.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/settings/IModeSetting.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/settings/RedstoneMode.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java mode change 100644 => 100755 src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java mode change 100644 => 100755 src/main/java/refinedstorage/util/InventoryUtils.java mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/cable.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/constructor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/controller.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/destructor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/detector.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/drive.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/exporter.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/external_storage.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/grid.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/importer.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/interface.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/machine_casing.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/relay.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/solderer.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/storage.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/lang/en_US.lang mode change 100644 => 100755 src/main/resources/assets/refinedstorage/lang/nl_NL.lang mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_core.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_down.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_east.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_north.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_south.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_up.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/block/cable_west.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/advanced_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/basic_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/blank_pattern.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/construction_core.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/destruction_core.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/improved_processor.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/printed_silicon.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/silicon.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/interface.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/constructor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/controller.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/destructor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/drive.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/interface.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/relay.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/solderer.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/storage.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/icons.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/basic_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/construction_core.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/destruction_core.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/improved_processor.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/silicon.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png mode change 100644 => 100755 src/main/resources/mcmod.info diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/logo.png b/logo.png old mode 100644 new mode 100755 diff --git a/screenshots/crafting_grid.png b/screenshots/crafting_grid.png old mode 100644 new mode 100755 diff --git a/screenshots/interface.png b/screenshots/interface.png old mode 100644 new mode 100755 diff --git a/screenshots/overview.png b/screenshots/overview.png old mode 100644 new mode 100755 diff --git a/screenshots/relays.png b/screenshots/relays.png old mode 100644 new mode 100755 diff --git a/screenshots/storage_block.png b/screenshots/storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java old mode 100644 new mode 100755 diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java old mode 100644 new mode 100755 diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java old mode 100644 new mode 100755 index 3b8857308..ad54e8340 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -16,49 +16,42 @@ import refinedstorage.item.ItemStorageCell; import refinedstorage.proxy.CommonProxy; @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) -public final class RefinedStorage -{ - public static final String ID = "refinedstorage"; - public static final String VERSION = "0.5"; +public final class RefinedStorage { + public static final String ID = "refinedstorage"; + public static final String VERSION = "0.5"; - public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); + public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID); - public static final CreativeTabs TAB = new CreativeTabs(ID) - { - @Override - public ItemStack getIconItemStack() - { - return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); - } + public static final CreativeTabs TAB = new CreativeTabs(ID) { + @Override + public ItemStack getIconItemStack() { + return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); + } - @Override - public Item getTabIconItem() - { - return null; - } - }; + @Override + public Item getTabIconItem() { + return null; + } + }; - @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") - public static CommonProxy PROXY; + @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") + public static CommonProxy PROXY; - @Instance - public static RefinedStorage INSTANCE; + @Instance + public static RefinedStorage INSTANCE; - @EventHandler - public void preInit(FMLPreInitializationEvent e) - { - PROXY.preInit(e); - } + @EventHandler + public void preInit(FMLPreInitializationEvent e) { + PROXY.preInit(e); + } - @EventHandler - public void init(FMLInitializationEvent e) - { - PROXY.init(e); - } + @EventHandler + public void init(FMLInitializationEvent e) { + PROXY.init(e); + } - @EventHandler - public void postInit(FMLPostInitializationEvent e) - { - PROXY.postInit(e); - } + @EventHandler + public void postInit(FMLPostInitializationEvent e) { + PROXY.postInit(e); + } } diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java old mode 100644 new mode 100755 index 34a084d99..f9b83e9b0 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -2,22 +2,21 @@ package refinedstorage; import refinedstorage.block.*; -public final class RefinedStorageBlocks -{ - public static final BlockController CONTROLLER = new BlockController(); - public static final BlockCable CABLE = new BlockCable(); - public static final BlockGrid GRID = new BlockGrid(); - public static final BlockDrive DRIVE = new BlockDrive(); - public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); - public static final BlockImporter IMPORTER = new BlockImporter(); - public static final BlockExporter EXPORTER = new BlockExporter(); - public static final BlockDetector DETECTOR = new BlockDetector(); - public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); - public static final BlockSolderer SOLDERER = new BlockSolderer(); - public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); - public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); - public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); - public static final BlockStorage STORAGE = new BlockStorage(); - public static final BlockRelay RELAY = new BlockRelay(); - public static final BlockInterface INTERFACE = new BlockInterface(); +public final class RefinedStorageBlocks { + public static final BlockController CONTROLLER = new BlockController(); + public static final BlockCable CABLE = new BlockCable(); + public static final BlockGrid GRID = new BlockGrid(); + public static final BlockDrive DRIVE = new BlockDrive(); + public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); + public static final BlockImporter IMPORTER = new BlockImporter(); + public static final BlockExporter EXPORTER = new BlockExporter(); + public static final BlockDetector DETECTOR = new BlockDetector(); + public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); + public static final BlockSolderer SOLDERER = new BlockSolderer(); + public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); + public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); + public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); + public static final BlockStorage STORAGE = new BlockStorage(); + public static final BlockRelay RELAY = new BlockRelay(); + public static final BlockInterface INTERFACE = new BlockInterface(); } diff --git a/src/main/java/refinedstorage/RefinedStorageGui.java b/src/main/java/refinedstorage/RefinedStorageGui.java old mode 100644 new mode 100755 index 9c5dce36a..b154ef611 --- a/src/main/java/refinedstorage/RefinedStorageGui.java +++ b/src/main/java/refinedstorage/RefinedStorageGui.java @@ -1,18 +1,17 @@ package refinedstorage; -public final class RefinedStorageGui -{ - public static final int CONTROLLER = 0; - public static final int GRID = 1; - public static final int DRIVE = 2; - public static final int IMPORTER = 4; - public static final int EXPORTER = 5; - public static final int DETECTOR = 6; - public static final int SOLDERER = 7; - public static final int WIRELESS_TRANSMITTER = 8; - public static final int DESTRUCTOR = 9; - public static final int CONSTRUCTOR = 10; - public static final int STORAGE = 11; - public static final int RELAY = 12; - public static final int INTERFACE = 13; +public final class RefinedStorageGui { + public static final int CONTROLLER = 0; + public static final int GRID = 1; + public static final int DRIVE = 2; + public static final int IMPORTER = 4; + public static final int EXPORTER = 5; + public static final int DETECTOR = 6; + public static final int SOLDERER = 7; + public static final int WIRELESS_TRANSMITTER = 8; + public static final int DESTRUCTOR = 9; + public static final int CONSTRUCTOR = 10; + public static final int STORAGE = 11; + public static final int RELAY = 12; + public static final int INTERFACE = 13; } diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java old mode 100644 new mode 100755 index 5d0349c10..cdc5128cc --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -2,14 +2,13 @@ package refinedstorage; import refinedstorage.item.*; -public final class RefinedStorageItems -{ - public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); - public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); - public static final ItemWirelessGridPlate WIRELESS_GRID_PLATE = new ItemWirelessGridPlate(); - public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); - public static final ItemCore CORE = new ItemCore(); - public static final ItemSilicon SILICON = new ItemSilicon(); - public static final ItemProcessor PROCESSOR = new ItemProcessor(); - public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); +public final class RefinedStorageItems { + public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); + public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); + public static final ItemWirelessGridPlate WIRELESS_GRID_PLATE = new ItemWirelessGridPlate(); + public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); + public static final ItemCore CORE = new ItemCore(); + public static final ItemSilicon SILICON = new ItemSilicon(); + public static final ItemProcessor PROCESSOR = new ItemProcessor(); + public static final ItemStoragePart STORAGE_PART = new ItemStoragePart(); } diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java old mode 100644 new mode 100755 index 78ae7db9f..3100bba22 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -18,117 +18,101 @@ import refinedstorage.RefinedStorage; import refinedstorage.tile.TileBase; import refinedstorage.util.InventoryUtils; -public abstract class BlockBase extends Block -{ - public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); +public abstract class BlockBase extends Block { + public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); - private String name; + private String name; - public BlockBase(String name) - { - super(Material.rock); + public BlockBase(String name) { + super(Material.rock); - this.name = name; + this.name = name; - setHardness(0.6F); - setCreativeTab(RefinedStorage.TAB); - } + setHardness(0.6F); + setCreativeTab(RefinedStorage.TAB); + } - @Override - public String getUnlocalizedName() - { - return "block." + RefinedStorage.ID + ":" + name; - } + @Override + public String getUnlocalizedName() { + return "block." + RefinedStorage.ID + ":" + name; + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + }); + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState(); - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); + } - @Override - public int getMetaFromState(IBlockState state) - { - return 0; - } + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase) - { - return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); - } + if (tile instanceof TileBase) { + return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); + } - return state; - } + return state; + } - @Override - public int damageDropped(IBlockState state) - { - return getMetaFromState(state); - } + @Override + public int damageDropped(IBlockState state) { + return getMetaFromState(state); + } - @Override - public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) - { - TileEntity tile = world.getTileEntity(pos); + @Override + public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase) - { - EnumFacing dir = ((TileBase) tile).getDirection(); + if (tile instanceof TileBase) { + EnumFacing dir = ((TileBase) tile).getDirection(); - int newDir = dir.ordinal() + 1; + int newDir = dir.ordinal() + 1; - if (newDir > EnumFacing.VALUES.length - 1) - { - newDir = 0; - } + if (newDir > EnumFacing.VALUES.length - 1) { + newDir = 0; + } - ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); + ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); - return true; - } + return true; + } - return false; - } + return false; + } - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) - { - super.onBlockPlacedBy(world, pos, state, player, itemStack); + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) { + super.onBlockPlacedBy(world, pos, state, player, itemStack); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase) - { - ((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(pos, player)); - } - } + if (tile instanceof TileBase) { + ((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(pos, player)); + } + } - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - TileEntity tile = world.getTileEntity(pos); + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileBase && ((TileBase) tile).getDroppedInventory() != null) - { - InventoryUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); - } + if (tile instanceof TileBase && ((TileBase) tile).getDroppedInventory() != null) { + InventoryUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); + } - super.breakBlock(world, pos, state); - } + super.breakBlock(world, pos, state); + } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java old mode 100644 new mode 100755 index 14429497e..a470d8704 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -11,82 +11,72 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.tile.TileCable; -public class BlockCable extends BlockBase -{ - public static final PropertyBool NORTH = PropertyBool.create("north"); - public static final PropertyBool EAST = PropertyBool.create("east"); - public static final PropertyBool SOUTH = PropertyBool.create("south"); - public static final PropertyBool WEST = PropertyBool.create("west"); - public static final PropertyBool UP = PropertyBool.create("up"); - public static final PropertyBool DOWN = PropertyBool.create("down"); +public class BlockCable extends BlockBase { + public static final PropertyBool NORTH = PropertyBool.create("north"); + public static final PropertyBool EAST = PropertyBool.create("east"); + public static final PropertyBool SOUTH = PropertyBool.create("south"); + public static final PropertyBool WEST = PropertyBool.create("west"); + public static final PropertyBool UP = PropertyBool.create("up"); + public static final PropertyBool DOWN = PropertyBool.create("down"); - public BlockCable() - { - super("cable"); - } + public BlockCable() { + super("cable"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - NORTH, - EAST, - SOUTH, - WEST, - UP, - DOWN, - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + NORTH, + EAST, + SOUTH, + WEST, + UP, + DOWN, + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(NORTH, TileCable.hasConnectionWith(world, pos.north())) - .withProperty(EAST, TileCable.hasConnectionWith(world, pos.east())) - .withProperty(SOUTH, TileCable.hasConnectionWith(world, pos.south())) - .withProperty(WEST, TileCable.hasConnectionWith(world, pos.west())) - .withProperty(UP, TileCable.hasConnectionWith(world, pos.up())) - .withProperty(DOWN, TileCable.hasConnectionWith(world, pos.down())); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(NORTH, TileCable.hasConnectionWith(world, pos.north())) + .withProperty(EAST, TileCable.hasConnectionWith(world, pos.east())) + .withProperty(SOUTH, TileCable.hasConnectionWith(world, pos.south())) + .withProperty(WEST, TileCable.hasConnectionWith(world, pos.west())) + .withProperty(UP, TileCable.hasConnectionWith(world, pos.up())) + .withProperty(DOWN, TileCable.hasConnectionWith(world, pos.down())); + } - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) - { - float pixel = 1F / 16F; + @Override + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + float pixel = 1F / 16F; - return new AxisAlignedBB(4 * pixel, 4 * pixel, 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel); - } + return new AxisAlignedBB(4 * pixel, 4 * pixel, 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel, 1 - 4 * pixel); + } - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) - { - return getBoundingBox(state, world, pos); - } + @Override + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + return getBoundingBox(state, world, pos); + } - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileCable(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileCable(); + } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } - @Override - public boolean isFullCube(IBlockState state) - { - return false; - } + @Override + public boolean isFullCube(IBlockState state) { + return false; + } } diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java old mode 100644 new mode 100755 index a5cba3d6a..daf47921b --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileConstructor; -public class BlockConstructor extends BlockMachine -{ - public BlockConstructor() - { - super("constructor"); - } +public class BlockConstructor extends BlockMachine { + public BlockConstructor() { + super("constructor"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileConstructor(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileConstructor(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java old mode 100644 new mode 100755 index b2e43dbdc..d28c88f60 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -1,6 +1,5 @@ package refinedstorage.block; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.properties.PropertyInteger; @@ -20,95 +19,82 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileController; -public class BlockController extends BlockBase -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); - public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8); +import java.util.List; - public BlockController() - { - super("controller"); - } +public class BlockController extends BlockBase { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class); + public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8); - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 1; i++) - { - subItems.add(new ItemStack(item, 1, i)); - } - } + public BlockController() { + super("controller"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - TYPE, - ENERGY - }); - } + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 1; i++) { + subItems.add(new ItemStack(item, 1, i)); + } + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + TYPE, + ENERGY + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaled(8)); - } + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; + } - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(ENERGY, ((TileController) world.getTileEntity(pos)).getEnergyScaled(8)); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileController(); - } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } - @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(RefinedStorage.INSTANCE, RefinedStorageGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileController(); + } - return true; - } + @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(RefinedStorage.INSTANCE, RefinedStorageGui.CONTROLLER, world, pos.getX(), pos.getY(), pos.getZ()); + } - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - ((TileController) world.getTileEntity(pos)).onDestroyed(); + return true; + } - super.breakBlock(world, pos, state); - } + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + ((TileController) world.getTileEntity(pos)).onDestroyed(); - @Override - public boolean hasComparatorInputOverride(IBlockState state) - { - return true; - } + super.breakBlock(world, pos, state); + } - @Override - public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) - { - return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15); - } + @Override + public boolean hasComparatorInputOverride(IBlockState state) { + return true; + } + + @Override + public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { + return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15); + } } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java old mode 100644 new mode 100755 index 1340fec88..230ff8258 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDestructor; -public class BlockDestructor extends BlockMachine -{ - public BlockDestructor() - { - super("destructor"); - } +public class BlockDestructor extends BlockMachine { + public BlockDestructor() { + super("destructor"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDestructor(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDestructor(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java old mode 100644 new mode 100755 index 56c4b09fe..2b66772f7 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -16,72 +16,61 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDetector; -public class BlockDetector extends BlockMachine -{ - public static final PropertyBool POWERED = PropertyBool.create("powered"); +public class BlockDetector extends BlockMachine { + public static final PropertyBool POWERED = PropertyBool.create("powered"); - public BlockDetector() - { - super("detector"); - } + public BlockDetector() { + super("detector"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - POWERED - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + POWERED + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).isPowered()); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(POWERED, ((TileDetector) world.getTileEntity(pos)).isPowered()); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDetector(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDetector(); + } - @Override - public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) - { - TileDetector detector = (TileDetector) world.getTileEntity(pos); + @Override + public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + TileDetector detector = (TileDetector) world.getTileEntity(pos); - if (detector.getDirection() == side.getOpposite()) - { - return detector.isPowered() ? 15 : 0; - } + if (detector.getDirection() == side.getOpposite()) { + return detector.isPowered() ? 15 : 0; + } - return 0; - } + return 0; + } - @Override - public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) - { - return getWeakPower(state, world, pos, side); - } + @Override + public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { + return getWeakPower(state, world, pos, side); + } - @Override - public boolean canProvidePower(IBlockState state) - { - return true; - } + @Override + public boolean canProvidePower(IBlockState state) { + return true; + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockDrive.java b/src/main/java/refinedstorage/block/BlockDrive.java old mode 100644 new mode 100755 index 383efe7d2..9f77ef4f2 --- a/src/main/java/refinedstorage/block/BlockDrive.java +++ b/src/main/java/refinedstorage/block/BlockDrive.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileDrive; -public class BlockDrive extends BlockMachine -{ - public BlockDrive() - { - super("drive"); - } +public class BlockDrive extends BlockMachine { + public BlockDrive() { + super("drive"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileDrive(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileDrive(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java old mode 100644 new mode 100755 index c99a30ccb..49f3ce855 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileExporter; -public class BlockExporter extends BlockMachine -{ - public BlockExporter() - { - super("exporter"); - } +public class BlockExporter extends BlockMachine { + public BlockExporter() { + super("exporter"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileExporter(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileExporter(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java old mode 100644 new mode 100755 index 470db6b9d..0fff22f58 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileExternalStorage; -public class BlockExternalStorage extends BlockMachine -{ - public BlockExternalStorage() - { - super("external_storage"); - } +public class BlockExternalStorage extends BlockMachine { + public BlockExternalStorage() { + super("external_storage"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileExternalStorage(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileExternalStorage(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java old mode 100644 new mode 100755 index 8f4d12621..1a3980d77 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -1,6 +1,5 @@ package refinedstorage.block; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -18,61 +17,53 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileGrid; -public class BlockGrid extends BlockMachine -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); +import java.util.List; - public BlockGrid() - { - super("grid"); - } +public class BlockGrid extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileGrid(); - } + public BlockGrid() { + super("grid"); + } - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 1; i++) - { - subItems.add(new ItemStack(item, 1, i)); - } - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileGrid(); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 1; i++) { + subItems.add(new ItemStack(item, 1, i)); + } + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); + } - @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(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; + } - return true; - } + @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(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java old mode 100644 new mode 100755 index 80bb1732b..013d1a33f --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileImporter; -public class BlockImporter extends BlockMachine -{ - public BlockImporter() - { - super("importer"); - } +public class BlockImporter extends BlockMachine { + public BlockImporter() { + super("importer"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileImporter(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileImporter(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java old mode 100644 new mode 100755 index 54c003f41..01260204d --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileInterface; -public class BlockInterface extends BlockMachine -{ - public BlockInterface() - { - super("interface"); - } +public class BlockInterface extends BlockMachine { + public BlockInterface() { + super("interface"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileInterface(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileInterface(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockMachine.java b/src/main/java/refinedstorage/block/BlockMachine.java old mode 100644 new mode 100755 index c75a2a9e4..981be3f10 --- a/src/main/java/refinedstorage/block/BlockMachine.java +++ b/src/main/java/refinedstorage/block/BlockMachine.java @@ -8,35 +8,30 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import refinedstorage.tile.TileMachine; -public abstract class BlockMachine extends BlockBase -{ - public static final PropertyBool CONNECTED = PropertyBool.create("connected"); +public abstract class BlockMachine extends BlockBase { + public static final PropertyBool CONNECTED = PropertyBool.create("connected"); - public BlockMachine(String name) - { - super(name); - } + public BlockMachine(String name) { + super(name); + } - @Override - public boolean hasTileEntity(IBlockState state) - { - return true; - } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(CONNECTED, ((TileMachine) world.getTileEntity(pos)).isConnected()); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(CONNECTED, ((TileMachine) world.getTileEntity(pos)).isConnected()); + } } diff --git a/src/main/java/refinedstorage/block/BlockMachineCasing.java b/src/main/java/refinedstorage/block/BlockMachineCasing.java old mode 100644 new mode 100755 index 9a41b9a93..26f626b40 --- a/src/main/java/refinedstorage/block/BlockMachineCasing.java +++ b/src/main/java/refinedstorage/block/BlockMachineCasing.java @@ -1,9 +1,7 @@ package refinedstorage.block; -public class BlockMachineCasing extends BlockBase -{ - public BlockMachineCasing() - { - super("machine_casing"); - } +public class BlockMachineCasing extends BlockBase { + public BlockMachineCasing() { + super("machine_casing"); + } } diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/refinedstorage/block/BlockRelay.java old mode 100644 new mode 100755 index 6b2a6f414..186da3ad8 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/refinedstorage/block/BlockRelay.java @@ -12,27 +12,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileRelay; -public class BlockRelay extends BlockMachine -{ - public BlockRelay() - { - super("relay"); - } +public class BlockRelay extends BlockMachine { + public BlockRelay() { + super("relay"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileRelay(); - } + @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(RefinedStorage.INSTANCE, RefinedStorageGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); - } + @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(RefinedStorage.INSTANCE, RefinedStorageGui.RELAY, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java old mode 100644 new mode 100755 index 9a782c960..997af4011 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -11,27 +11,22 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileSolderer; -public class BlockSolderer extends BlockMachine -{ - public BlockSolderer() - { - super("solderer"); - } +public class BlockSolderer extends BlockMachine { + public BlockSolderer() { + super("solderer"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileSolderer(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileSolderer(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java old mode 100644 new mode 100755 index 286ad9e35..f07ec7e23 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -1,7 +1,5 @@ package refinedstorage.block; -import java.util.ArrayList; -import java.util.List; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -24,111 +22,98 @@ import refinedstorage.RefinedStorageGui; import refinedstorage.item.ItemBlockStorage; import refinedstorage.tile.TileStorage; -public class BlockStorage extends BlockMachine -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); +import java.util.ArrayList; +import java.util.List; - public BlockStorage() - { - super("storage"); - } +public class BlockStorage extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); - @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))); - } - } + public BlockStorage() { + super("storage"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } + @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 - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumStorageType) state.getValue(TYPE)).getId(); - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileStorage(); - } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumStorageType) state.getValue(TYPE)).getId(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileStorage(); + } - return true; - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); + } - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) - { - super.onBlockPlacedBy(world, pos, state, player, stack); + return true; + } - NBTTagCompound tag = stack.getTagCompound(); + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, player, stack); - if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) - { - ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); - } - } + NBTTagCompound tag = stack.getTagCompound(); - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) - { - List drops = new ArrayList(); + if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) { + ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); + } + } - ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + List drops = new ArrayList(); - NBTTagCompound tag = new NBTTagCompound(); + ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); - tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); + NBTTagCompound tag = new NBTTagCompound(); - stack.setTagCompound(tag); + tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); - drops.add(stack); + stack.setTagCompound(tag); - return drops; - } + drops.add(stack); - @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - if (willHarvest) - { - return true; - } + return drops; + } - return super.removedByPlayer(state, world, pos, player, willHarvest); - } + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + return true; + } - @Override - public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) - { - super.harvestBlock(world, player, pos, state, tile, stack); + return super.removedByPlayer(state, world, pos, player, willHarvest); + } - world.setBlockToAir(pos); - } + @Override + public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack) { + super.harvestBlock(world, player, pos, state, tile, stack); + + world.setBlockToAir(pos); + } } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java old mode 100644 new mode 100755 index 9438cc94a..179d80397 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -16,47 +16,40 @@ import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; import refinedstorage.tile.TileWirelessTransmitter; -public class BlockWirelessTransmitter extends BlockMachine -{ - public static final PropertyBool WORKING = PropertyBool.create("working"); +public class BlockWirelessTransmitter extends BlockMachine { + public static final PropertyBool WORKING = PropertyBool.create("working"); - public BlockWirelessTransmitter() - { - super("wireless_transmitter"); - } + public BlockWirelessTransmitter() { + super("wireless_transmitter"); + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - WORKING - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + WORKING + }); + } - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) - { - return super.getActualState(state, world, pos) - .withProperty(WORKING, ((TileWirelessTransmitter) world.getTileEntity(pos)).isWorking()); - } + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + return super.getActualState(state, world, pos) + .withProperty(WORKING, ((TileWirelessTransmitter) world.getTileEntity(pos)).isWorking()); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileWirelessTransmitter(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileWirelessTransmitter(); + } - @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) - { - if (!world.isRemote) - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); - } + @Override + public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + if (!world.isRemote) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); + } - return true; - } + return true; + } } diff --git a/src/main/java/refinedstorage/block/EnumControllerType.java b/src/main/java/refinedstorage/block/EnumControllerType.java old mode 100644 new mode 100755 index e64f09d74..7959bfe41 --- a/src/main/java/refinedstorage/block/EnumControllerType.java +++ b/src/main/java/refinedstorage/block/EnumControllerType.java @@ -2,34 +2,29 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumControllerType implements IStringSerializable -{ - NORMAL(0, "normal"), - CREATIVE(1, "creative"); +public enum EnumControllerType implements IStringSerializable { + NORMAL(0, "normal"), + CREATIVE(1, "creative"); - private int id; - private String name; + private int id; + private String name; - EnumControllerType(int id, String name) - { - this.id = id; - this.name = name; - } + EnumControllerType(int id, String name) { + this.id = id; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } } diff --git a/src/main/java/refinedstorage/block/EnumGridType.java b/src/main/java/refinedstorage/block/EnumGridType.java old mode 100644 new mode 100755 index 8c0553ebe..e2c6ff308 --- a/src/main/java/refinedstorage/block/EnumGridType.java +++ b/src/main/java/refinedstorage/block/EnumGridType.java @@ -2,35 +2,30 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumGridType implements IStringSerializable -{ - NORMAL(0, "normal"), - CRAFTING(1, "crafting"); +public enum EnumGridType implements IStringSerializable { + NORMAL(0, "normal"), + CRAFTING(1, "crafting"); - private int id; - private String name; + private int id; + private String name; - EnumGridType(int id, String name) - { - this.id = id; - this.name = name; - } + EnumGridType(int id, String name) { + this.id = id; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } } diff --git a/src/main/java/refinedstorage/block/EnumStorageType.java b/src/main/java/refinedstorage/block/EnumStorageType.java old mode 100644 new mode 100755 index 0ad8a8708..85fed352a --- a/src/main/java/refinedstorage/block/EnumStorageType.java +++ b/src/main/java/refinedstorage/block/EnumStorageType.java @@ -2,57 +2,48 @@ package refinedstorage.block; import net.minecraft.util.IStringSerializable; -public enum EnumStorageType implements IStringSerializable -{ - TYPE_1K(0, 1000, "1k"), - TYPE_4K(1, 4000, "4k"), - TYPE_16K(2, 16000, "16k"), - TYPE_64K(3, 64000, "64k"), - TYPE_CREATIVE(4, -1, "creative"); +public enum EnumStorageType implements IStringSerializable { + TYPE_1K(0, 1000, "1k"), + TYPE_4K(1, 4000, "4k"), + TYPE_16K(2, 16000, "16k"), + TYPE_64K(3, 64000, "64k"), + TYPE_CREATIVE(4, -1, "creative"); - private int id; - private int capacity; - private String name; + private int id; + private int capacity; + private String name; - EnumStorageType(int id, int capacity, String name) - { - this.id = id; - this.capacity = capacity; - this.name = name; - } + EnumStorageType(int id, int capacity, String name) { + this.id = id; + this.capacity = capacity; + this.name = name; + } - @Override - public String getName() - { - return name; - } + @Override + public String getName() { + return name; + } - public int getId() - { - return id; - } + public int getId() { + return id; + } - public int getCapacity() - { - return capacity; - } + public int getCapacity() { + return capacity; + } - @Override - public String toString() - { - return name; - } + @Override + public String toString() { + return name; + } - public static EnumStorageType getById(int id) - { - for (EnumStorageType type : EnumStorageType.values()) - { - if (type.getId() == id) - { - return type; - } - } + public static EnumStorageType getById(int id) { + for (EnumStorageType type : EnumStorageType.values()) { + if (type.getId() == id) { + return type; + } + } - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java old mode 100644 new mode 100755 index 85a14dc93..77224ef32 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -1,7 +1,5 @@ package refinedstorage.container; -import java.util.ArrayList; -import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ClickType; @@ -11,141 +9,113 @@ import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotDisabled; import refinedstorage.container.slot.SlotSpecimen; -public abstract class ContainerBase extends Container -{ - private EntityPlayer player; +import java.util.ArrayList; +import java.util.List; - private List playerInventorySlots = new ArrayList(); +public abstract class ContainerBase extends Container { + private EntityPlayer player; - public ContainerBase(EntityPlayer player) - { - this.player = player; - } + private List playerInventorySlots = new ArrayList(); - public EntityPlayer getPlayer() - { - return player; - } + public ContainerBase(EntityPlayer player) { + this.player = player; + } - protected void addPlayerInventory(int xInventory, int yInventory) - { - int id = 0; + public EntityPlayer getPlayer() { + return player; + } - for (int i = 0; i < 9; i++) - { - Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); + protected void addPlayerInventory(int xInventory, int yInventory) { + int id = 0; - playerInventorySlots.add(slot); + for (int i = 0; i < 9; i++) { + Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); - addSlotToContainer(slot); + playerInventorySlots.add(slot); - id++; - } + addSlotToContainer(slot); - for (int y = 0; y < 3; y++) - { - for (int x = 0; x < 9; x++) - { - Slot slot = new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18); + id++; + } - playerInventorySlots.add(slot); + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + Slot slot = new Slot(player.inventory, id, xInventory + x * 18, yInventory + y * 18); - addSlotToContainer(slot); + playerInventorySlots.add(slot); - id++; - } - } - } + addSlotToContainer(slot); - @Override - public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) - { - Slot slot = id >= 0 ? getSlot(id) : null; + id++; + } + } + } - if (slot instanceof SlotSpecimen) - { - if (((SlotSpecimen) slot).isSizeAllowed()) - { - if (player.inventory.getItemStack() != null) - { - int amount = player.inventory.getItemStack().stackSize; + @Override + public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) { + Slot slot = id >= 0 ? getSlot(id) : null; - if (clickedButton == 1) - { - amount = 1; - } + if (slot instanceof SlotSpecimen) { + if (((SlotSpecimen) slot).isSizeAllowed()) { + if (player.inventory.getItemStack() != null) { + int amount = player.inventory.getItemStack().stackSize; - ItemStack toPut = player.inventory.getItemStack().copy(); - toPut.stackSize = amount; + if (clickedButton == 1) { + amount = 1; + } - slot.putStack(toPut); - } - else if (slot.getStack() != null) - { - if (GuiScreen.isShiftKeyDown()) - { - slot.putStack(null); - } - else - { - int amount = slot.getStack().stackSize; + ItemStack toPut = player.inventory.getItemStack().copy(); + toPut.stackSize = amount; - if (clickedButton == 0) - { - amount++; + slot.putStack(toPut); + } else if (slot.getStack() != null) { + if (GuiScreen.isShiftKeyDown()) { + slot.putStack(null); + } else { + int amount = slot.getStack().stackSize; - if (amount > 64) - { - amount = 64; - } - } - else if (clickedButton == 1) - { - amount--; + if (clickedButton == 0) { + amount++; - if (amount < 1) - { - amount = 1; - } - } + if (amount > 64) { + amount = 64; + } + } else if (clickedButton == 1) { + amount--; - slot.getStack().stackSize = amount; - } - } - } - else if (player.inventory.getItemStack() == null) - { - slot.putStack(null); - } - else if (slot.isItemValid(player.inventory.getItemStack())) - { - slot.putStack(player.inventory.getItemStack().copy()); - } + if (amount < 1) { + amount = 1; + } + } - return player.inventory.getItemStack(); - } - else if (slot instanceof SlotDisabled) - { - return null; - } + slot.getStack().stackSize = amount; + } + } + } else if (player.inventory.getItemStack() == null) { + slot.putStack(null); + } else if (slot.isItemValid(player.inventory.getItemStack())) { + slot.putStack(player.inventory.getItemStack().copy()); + } - return super.func_184996_a(id, clickedButton, clickType, player); - } + return player.inventory.getItemStack(); + } else if (slot instanceof SlotDisabled) { + return null; + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) - { - return null; - } + return super.func_184996_a(id, clickedButton, clickType, player); + } - @Override - public boolean canInteractWith(EntityPlayer player) - { - return true; - } + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { + return null; + } - public List getPlayerInventorySlots() - { - return playerInventorySlots; - } + @Override + public boolean canInteractWith(EntityPlayer player) { + return true; + } + + public List getPlayerInventorySlots() { + return playerInventorySlots; + } } diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java old mode 100644 new mode 100755 index 9e780e64b..910dfcebb --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -7,28 +7,23 @@ import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileConstructor; -public class ContainerConstructor extends ContainerBase -{ - class SlotConstructor extends SlotSpecimen - { - public SlotConstructor(IInventory inventory, int id, int x, int y) - { - super(inventory, id, x, y, false); - } +public class ContainerConstructor extends ContainerBase { + class SlotConstructor extends SlotSpecimen { + public SlotConstructor(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y, false); + } - @Override - public boolean isItemValid(ItemStack stack) - { - return stack.getItem() instanceof ItemBlock; - } - } + @Override + public boolean isItemValid(ItemStack stack) { + return stack.getItem() instanceof ItemBlock; + } + } - public ContainerConstructor(EntityPlayer player, TileConstructor constructor) - { - super(player); + public ContainerConstructor(EntityPlayer player, TileConstructor constructor) { + super(player); - addSlotToContainer(new SlotConstructor(constructor.getInventory(), 0, 80, 20)); + addSlotToContainer(new SlotConstructor(constructor.getInventory(), 0, 80, 20)); - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerController.java b/src/main/java/refinedstorage/container/ContainerController.java old mode 100644 new mode 100755 index 9cc437a7e..79b385d7b --- a/src/main/java/refinedstorage/container/ContainerController.java +++ b/src/main/java/refinedstorage/container/ContainerController.java @@ -2,12 +2,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerController extends ContainerBase -{ - public ContainerController(EntityPlayer player) - { - super(player); +public class ContainerController extends ContainerBase { + public ContainerController(EntityPlayer player) { + super(player); - addPlayerInventory(8, 99); - } + addPlayerInventory(8, 99); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java old mode 100644 new mode 100755 index ed279dd82..ce722492e --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -2,12 +2,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerDestructor extends ContainerBase -{ - public ContainerDestructor(EntityPlayer player) - { - super(player); +public class ContainerDestructor extends ContainerBase { + public ContainerDestructor(EntityPlayer player) { + super(player); - addPlayerInventory(8, 50); - } + addPlayerInventory(8, 50); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDetector.java b/src/main/java/refinedstorage/container/ContainerDetector.java old mode 100644 new mode 100755 index b89996610..6b0aed992 --- a/src/main/java/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/refinedstorage/container/ContainerDetector.java @@ -4,14 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileDetector; -public class ContainerDetector extends ContainerBase -{ - public ContainerDetector(EntityPlayer player, TileDetector detector) - { - super(player); +public class ContainerDetector extends ContainerBase { + public ContainerDetector(EntityPlayer player, TileDetector detector) { + super(player); - addSlotToContainer(new SlotSpecimen(detector.getInventory(), 0, 107, 20, false)); + addSlotToContainer(new SlotSpecimen(detector.getInventory(), 0, 107, 20, false)); - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerDrive.java b/src/main/java/refinedstorage/container/ContainerDrive.java old mode 100644 new mode 100755 index f62e8dbcf..a0dc7efd9 --- a/src/main/java/refinedstorage/container/ContainerDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDrive.java @@ -6,20 +6,16 @@ import refinedstorage.container.slot.BasicItemValidator; import refinedstorage.container.slot.SlotFiltered; import refinedstorage.tile.TileDrive; -public class ContainerDrive extends ContainerStorage -{ - public ContainerDrive(EntityPlayer player, TileDrive drive) - { - super(player, drive.getInventory()); +public class ContainerDrive extends ContainerStorage { + public ContainerDrive(EntityPlayer player, TileDrive drive) { + super(player, drive.getInventory()); - for (int i = 0; i < 4; ++i) - { - addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); - } + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); + } - for (int i = 0; i < 4; ++i) - { - addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); - } - } + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); + } + } } diff --git a/src/main/java/refinedstorage/container/ContainerExporter.java b/src/main/java/refinedstorage/container/ContainerExporter.java old mode 100644 new mode 100755 index 65132fda8..7135754cf --- a/src/main/java/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/refinedstorage/container/ContainerExporter.java @@ -4,17 +4,14 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileExporter; -public class ContainerExporter extends ContainerBase -{ - public ContainerExporter(EntityPlayer player, TileExporter exporter) - { - super(player); +public class ContainerExporter extends ContainerBase { + public ContainerExporter(EntityPlayer player, TileExporter exporter) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(exporter.getInventory(), i, 8 + (18 * i), 20, false)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(exporter.getInventory(), i, 8 + (18 * i), 20, false)); + } - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java old mode 100644 new mode 100755 index e31a62fa3..6ea9ab657 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -6,37 +6,32 @@ import refinedstorage.block.EnumGridType; import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.tile.TileGrid; -public class ContainerGrid extends ContainerBase -{ - private TileGrid grid; +public class ContainerGrid extends ContainerBase { + private TileGrid grid; - public ContainerGrid(EntityPlayer player, TileGrid grid) - { - super(player); + public ContainerGrid(EntityPlayer player, TileGrid grid) { + super(player); - this.grid = grid; + this.grid = grid; - addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108); + addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108); - if (grid.getType() == EnumGridType.CRAFTING) - { - int x = 25; - int y = 106; + if (grid.getType() == EnumGridType.CRAFTING) { + int x = 25; + int y = 106; - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new Slot(grid.getCraftingInventory(), i, x, y)); + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(grid.getCraftingInventory(), i, x, y)); - x += 18; + x += 18; - if ((i + 1) % 3 == 0) - { - y += 18; - x = 25; - } - } + if ((i + 1) % 3 == 0) { + y += 18; + x = 25; + } + } - addSlotToContainer(new SlotGridCraftingResult(player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); - } - } + addSlotToContainer(new SlotGridCraftingResult(player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); + } + } } diff --git a/src/main/java/refinedstorage/container/ContainerImporter.java b/src/main/java/refinedstorage/container/ContainerImporter.java old mode 100644 new mode 100755 index b5234f525..49737cc92 --- a/src/main/java/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/refinedstorage/container/ContainerImporter.java @@ -4,17 +4,14 @@ import net.minecraft.entity.player.EntityPlayer; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileImporter; -public class ContainerImporter extends ContainerBase -{ - public ContainerImporter(EntityPlayer player, TileImporter importer) - { - super(player); +public class ContainerImporter extends ContainerBase { + public ContainerImporter(EntityPlayer player, TileImporter importer) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(importer.getInventory(), i, 8 + (18 * i), 20, false)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(importer.getInventory(), i, 8 + (18 * i), 20, false)); + } - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } } diff --git a/src/main/java/refinedstorage/container/ContainerInterface.java b/src/main/java/refinedstorage/container/ContainerInterface.java old mode 100644 new mode 100755 index 1a2403940..6defd3f33 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/refinedstorage/container/ContainerInterface.java @@ -7,63 +7,49 @@ import refinedstorage.container.slot.SlotOutput; import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileInterface; -public class ContainerInterface extends ContainerBase -{ - public ContainerInterface(EntityPlayer player, TileInterface tile) - { - super(player); +public class ContainerInterface extends ContainerBase { + public ContainerInterface(EntityPlayer player, TileInterface tile) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new Slot(tile, i, 8 + (18 * i), 20)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new Slot(tile, i, 8 + (18 * i), 20)); + } - for (int i = 9; i < 18; ++i) - { - addSlotToContainer(new SlotSpecimen(tile, i, 8 + (18 * (i - 9)), 54, true)); - } + for (int i = 9; i < 18; ++i) { + addSlotToContainer(new SlotSpecimen(tile, i, 8 + (18 * (i - 9)), 54, true)); + } - for (int i = 18; i < 27; ++i) - { - addSlotToContainer(new SlotOutput(tile, i, 8 + (18 * (i - 18)), 100)); - } + for (int i = 18; i < 27; ++i) { + addSlotToContainer(new SlotOutput(tile, i, 8 + (18 * (i - 18)), 100)); + } - addPlayerInventory(8, 136); - } + addPlayerInventory(8, 136); + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; - Slot slot = getSlot(index); + Slot slot = getSlot(index); - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); - if (index < 9) - { - if (!mergeItemStack(stack, 9, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 9, false)) - { - return null; - } + if (index < 9) { + if (!mergeItemStack(stack, 9, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 9, false)) { + return null; + } - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } - return stack; - } + return stack; + } } diff --git a/src/main/java/refinedstorage/container/ContainerRelay.java b/src/main/java/refinedstorage/container/ContainerRelay.java old mode 100644 new mode 100755 index 1048e51f9..0c8a0a1de --- a/src/main/java/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/refinedstorage/container/ContainerRelay.java @@ -2,12 +2,10 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -public class ContainerRelay extends ContainerBase -{ - public ContainerRelay(EntityPlayer player) - { - super(player); +public class ContainerRelay extends ContainerBase { + public ContainerRelay(EntityPlayer player) { + super(player); - addPlayerInventory(8, 50); - } + addPlayerInventory(8, 50); + } } diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java old mode 100644 new mode 100755 index 70c5ac1bf..a0077fd64 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -6,60 +6,48 @@ import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotOutput; import refinedstorage.tile.TileSolderer; -public class ContainerSolderer extends ContainerBase -{ - public ContainerSolderer(EntityPlayer player, TileSolderer solderer) - { - super(player); +public class ContainerSolderer extends ContainerBase { + public ContainerSolderer(EntityPlayer player, TileSolderer solderer) { + super(player); - int x = 44; - int y = 20; + int x = 44; + int y = 20; - for (int i = 0; i < 3; ++i) - { - addSlotToContainer(new Slot(solderer, i, x, y)); + for (int i = 0; i < 3; ++i) { + addSlotToContainer(new Slot(solderer, i, x, y)); - y += 18; - } + y += 18; + } - addSlotToContainer(new SlotOutput(solderer, 3, 134, 38)); + addSlotToContainer(new SlotOutput(solderer, 3, 134, 38)); - addPlayerInventory(8, 95); - } + addPlayerInventory(8, 95); + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; - Slot slot = getSlot(index); + Slot slot = getSlot(index); - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); - if (index < 3) - { - if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 3, false)) - { - return null; - } + if (index < 3) { + if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 3, false)) { + return null; + } - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } - return stack; - } + return stack; + } } diff --git a/src/main/java/refinedstorage/container/ContainerStorage.java b/src/main/java/refinedstorage/container/ContainerStorage.java old mode 100644 new mode 100755 index 7c4fd8974..dcc1535a7 --- a/src/main/java/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/refinedstorage/container/ContainerStorage.java @@ -4,17 +4,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import refinedstorage.container.slot.SlotSpecimen; -public class ContainerStorage extends ContainerBase -{ - public ContainerStorage(EntityPlayer player, IInventory inventory) - { - super(player); +public class ContainerStorage extends ContainerBase { + public ContainerStorage(EntityPlayer player, IInventory inventory) { + super(player); - for (int i = 0; i < 9; ++i) - { - addSlotToContainer(new SlotSpecimen(inventory, i, 8 + (18 * i), 20, false)); - } + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimen(inventory, i, 8 + (18 * i), 20, false)); + } - addPlayerInventory(8, 129); - } + addPlayerInventory(8, 129); + } } diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java old mode 100644 new mode 100755 index 802b37dd4..f2365e42b --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java @@ -10,52 +10,41 @@ import refinedstorage.container.slot.SlotFiltered; import refinedstorage.container.slot.SlotOutput; import refinedstorage.tile.TileWirelessTransmitter; -public class ContainerWirelessTransmitter extends ContainerBase -{ - public ContainerWirelessTransmitter(EntityPlayer player, TileWirelessTransmitter wirelessTransmitter) - { - super(player); +public class ContainerWirelessTransmitter extends ContainerBase { + public ContainerWirelessTransmitter(EntityPlayer player, TileWirelessTransmitter wirelessTransmitter) { + super(player); - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl))); - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID))); - addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 20)); + addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl))); + addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID))); + addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 20)); - addPlayerInventory(8, 55); - } + addPlayerInventory(8, 55); + } - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) - { - ItemStack stack = null; + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; - Slot slot = getSlot(index); + Slot slot = getSlot(index); - if (slot != null && slot.getHasStack()) - { - stack = slot.getStack().copy(); + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); - if (index < 3) - { - if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stack, 0, 3, false)) - { - return null; - } + if (index < 3) { + if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 3, false)) { + return null; + } - if (stack.stackSize == 0) - { - slot.putStack(null); - } - else - { - slot.onSlotChanged(); - } - } + if (stack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } - return stack; - } + return stack; + } } diff --git a/src/main/java/refinedstorage/container/slot/BasicItemValidator.java b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java old mode 100644 new mode 100755 index 53a1071ac..eb6c5702c --- a/src/main/java/refinedstorage/container/slot/BasicItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java @@ -3,18 +3,15 @@ package refinedstorage.container.slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class BasicItemValidator implements IItemValidator -{ - private Item item; +public class BasicItemValidator implements IItemValidator { + private Item item; - public BasicItemValidator(Item item) - { - this.item = item; - } + public BasicItemValidator(Item item) { + this.item = item; + } - @Override - public boolean isValid(ItemStack stack) - { - return item == stack.getItem(); - } + @Override + public boolean isValid(ItemStack stack) { + return item == stack.getItem(); + } } diff --git a/src/main/java/refinedstorage/container/slot/IItemValidator.java b/src/main/java/refinedstorage/container/slot/IItemValidator.java old mode 100644 new mode 100755 index 5a38125f0..acf5617a7 --- a/src/main/java/refinedstorage/container/slot/IItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/IItemValidator.java @@ -2,7 +2,6 @@ package refinedstorage.container.slot; import net.minecraft.item.ItemStack; -public interface IItemValidator -{ - public boolean isValid(ItemStack stack); +public interface IItemValidator { + public boolean isValid(ItemStack stack); } diff --git a/src/main/java/refinedstorage/container/slot/SlotDisabled.java b/src/main/java/refinedstorage/container/slot/SlotDisabled.java old mode 100644 new mode 100755 index 8e6851582..a350b648b --- a/src/main/java/refinedstorage/container/slot/SlotDisabled.java +++ b/src/main/java/refinedstorage/container/slot/SlotDisabled.java @@ -4,16 +4,13 @@ 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); - } +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; - } + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotFiltered.java b/src/main/java/refinedstorage/container/slot/SlotFiltered.java old mode 100644 new mode 100755 index 2d43a1603..33ba8e404 --- a/src/main/java/refinedstorage/container/slot/SlotFiltered.java +++ b/src/main/java/refinedstorage/container/slot/SlotFiltered.java @@ -4,20 +4,17 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotFiltered extends Slot -{ - private IItemValidator validator; +public class SlotFiltered extends Slot { + private IItemValidator validator; - public SlotFiltered(IInventory inventory, int id, int x, int y, IItemValidator validator) - { - super(inventory, id, x, y); + public SlotFiltered(IInventory inventory, int id, int x, int y, IItemValidator validator) { + super(inventory, id, x, y); - this.validator = validator; - } + this.validator = validator; + } - @Override - public boolean isItemValid(ItemStack item) - { - return validator.isValid(item); - } + @Override + public boolean isItemValid(ItemStack item) { + return validator.isValid(item); + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java old mode 100644 new mode 100755 index fa110f6b8..e0db40e0d --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -7,34 +7,29 @@ import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import refinedstorage.tile.TileGrid; -public class SlotGridCraftingResult extends SlotCrafting -{ - private IInventory craftingMatrix; - private TileGrid grid; +public class SlotGridCraftingResult extends SlotCrafting { + private IInventory craftingMatrix; + private TileGrid grid; - public SlotGridCraftingResult(EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) - { - super(player, craftingMatrix, craftingResult, id, x, y); + public SlotGridCraftingResult(EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) { + super(player, craftingMatrix, craftingResult, id, x, y); - this.craftingMatrix = craftingMatrix; - this.grid = grid; - } + this.craftingMatrix = craftingMatrix; + this.grid = grid; + } - @Override - public void onPickupFromSlot(EntityPlayer player, ItemStack stack) - { - ItemStack[] matrixSlots = new ItemStack[craftingMatrix.getSizeInventory()]; + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + ItemStack[] matrixSlots = new ItemStack[craftingMatrix.getSizeInventory()]; - for (int i = 0; i < craftingMatrix.getSizeInventory(); ++i) - { - if (craftingMatrix.getStackInSlot(i) != null) - { - matrixSlots[i] = craftingMatrix.getStackInSlot(i).copy(); - } - } + for (int i = 0; i < craftingMatrix.getSizeInventory(); ++i) { + if (craftingMatrix.getStackInSlot(i) != null) { + matrixSlots[i] = craftingMatrix.getStackInSlot(i).copy(); + } + } - super.onPickupFromSlot(player, stack); + super.onPickupFromSlot(player, stack); - grid.onCrafted(matrixSlots); - } + grid.onCrafted(matrixSlots); + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotOutput.java b/src/main/java/refinedstorage/container/slot/SlotOutput.java old mode 100644 new mode 100755 index e3e6c3f45..de622aba5 --- a/src/main/java/refinedstorage/container/slot/SlotOutput.java +++ b/src/main/java/refinedstorage/container/slot/SlotOutput.java @@ -4,16 +4,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotOutput extends Slot -{ - public SlotOutput(IInventory inventory, int id, int x, int y) - { - super(inventory, id, x, y); - } +public class SlotOutput extends Slot { + public SlotOutput(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + } - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } + @Override + public boolean isItemValid(ItemStack stack) { + return false; + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java old mode 100644 new mode 100755 index 87ab2a6c6..e56a98962 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java @@ -5,42 +5,35 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class SlotSpecimen extends Slot -{ - private boolean sizeAllowed; +public class SlotSpecimen extends Slot { + private boolean sizeAllowed; - public SlotSpecimen(IInventory inventory, int id, int x, int y, boolean allowSize) - { - super(inventory, id, x, y); + public SlotSpecimen(IInventory inventory, int id, int x, int y, boolean allowSize) { + super(inventory, id, x, y); - this.sizeAllowed = allowSize; - } + this.sizeAllowed = allowSize; + } - @Override - public boolean canTakeStack(EntityPlayer player) - { - return false; - } + @Override + public boolean canTakeStack(EntityPlayer player) { + return false; + } - @Override - public boolean isItemValid(ItemStack stack) - { - return true; - } + @Override + public boolean isItemValid(ItemStack stack) { + return true; + } - @Override - public void putStack(ItemStack stack) - { - if (stack != null && !sizeAllowed) - { - stack.stackSize = 1; - } + @Override + public void putStack(ItemStack stack) { + if (stack != null && !sizeAllowed) { + stack.stackSize = 1; + } - super.putStack(stack); - } + super.putStack(stack); + } - public boolean isSizeAllowed() - { - return sizeAllowed; - } + public boolean isSizeAllowed() { + return sizeAllowed; + } } diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java old mode 100644 new mode 100755 index d023ee0cb..25c02d4c9 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -1,9 +1,5 @@ package refinedstorage.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -15,222 +11,196 @@ import org.lwjgl.opengl.GL11; import refinedstorage.RefinedStorage; import refinedstorage.gui.sidebutton.SideButton; -public abstract class GuiBase extends GuiContainer -{ - public static final int SIDE_BUTTON_WIDTH = 20; - public static final int SIDE_BUTTON_HEIGHT = 20; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; - private List sideButtons = new ArrayList(); +public abstract class GuiBase extends GuiContainer { + public static final int SIDE_BUTTON_WIDTH = 20; + public static final int SIDE_BUTTON_HEIGHT = 20; - private int lastButtonId = 0; - private int lastSideButtonY = 6; + private List sideButtons = new ArrayList(); - protected int width; - protected int height; + private int lastButtonId = 0; + private int lastSideButtonY = 6; - public GuiBase(Container container, int width, int height) - { - super(container); + protected int width; + protected int height; - this.width = width; - this.height = height; - this.xSize = width; - this.ySize = height; - } + public GuiBase(Container container, int width, int height) { + super(container); - @Override - public void initGui() - { - if (sideButtons.size() > 0) - { - xSize -= SIDE_BUTTON_WIDTH; - } + this.width = width; + this.height = height; + this.xSize = width; + this.ySize = height; + } - super.initGui(); + @Override + public void initGui() { + if (sideButtons.size() > 0) { + xSize -= SIDE_BUTTON_WIDTH; + } - sideButtons.clear(); + super.initGui(); - lastButtonId = 0; - lastSideButtonY = 6; + sideButtons.clear(); - init(guiLeft, guiTop); + lastButtonId = 0; + lastSideButtonY = 6; - if (sideButtons.size() > 0) - { - xSize += SIDE_BUTTON_WIDTH; - } - } + init(guiLeft, guiTop); - @Override - public void updateScreen() - { - super.updateScreen(); + if (sideButtons.size() > 0) { + xSize += SIDE_BUTTON_WIDTH; + } + } - update(guiLeft, guiTop); - } + @Override + public void updateScreen() { + super.updateScreen(); - @Override - protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + update(guiLeft, guiTop); + } - drawBackground(guiLeft, guiTop, mouseX, mouseY); - } + @Override + protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + drawBackground(guiLeft, guiTop, mouseX, mouseY); + } - mouseX -= guiLeft; - mouseY -= guiTop; + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - for (SideButton sideButton : sideButtons) - { - GL11.glDisable(GL11.GL_LIGHTING); - sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); - GL11.glEnable(GL11.GL_LIGHTING); + mouseX -= guiLeft; + mouseY -= guiTop; - if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); - } - } + for (SideButton sideButton : sideButtons) { + GL11.glDisable(GL11.GL_LIGHTING); + sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); + GL11.glEnable(GL11.GL_LIGHTING); - drawForeground(mouseX, mouseY); - } + if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); + } + } - @Override - protected void actionPerformed(GuiButton button) throws IOException - { - super.actionPerformed(button); + drawForeground(mouseX, mouseY); + } - for (SideButton sideButton : sideButtons) - { - if (sideButton.getId() == button.id) - { - sideButton.actionPerformed(); - } - } - } + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); - public GuiButton addButton(int x, int y, int w, int h) - { - return addButton(x, y, w, h, ""); - } + for (SideButton sideButton : sideButtons) { + if (sideButton.getId() == button.id) { + sideButton.actionPerformed(); + } + } + } - public GuiButton addButton(int x, int y, int w, int h, String text) - { - GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); + public GuiButton addButton(int x, int y, int w, int h) { + return addButton(x, y, w, h, ""); + } - buttonList.add(button); + public GuiButton addButton(int x, int y, int w, int h, String text) { + GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); - return button; - } + buttonList.add(button); - public void addSideButton(SideButton button) - { - button.setX(xSize - 1); - button.setY(lastSideButtonY); - button.setId(addButton(guiLeft + button.getX(), guiTop + button.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT).id); + return button; + } - lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; + public void addSideButton(SideButton button) { + button.setX(xSize - 1); + button.setY(lastSideButtonY); + button.setId(addButton(guiLeft + button.getX(), guiTop + button.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT).id); - sideButtons.add(button); - } + lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; - public boolean inBounds(int x, int y, int w, int h, int ox, int oy) - { - return ox >= x && ox <= x + w && oy >= y && oy <= y + h; - } + sideButtons.add(button); + } - public void bindTexture(String file) - { - bindTexture(RefinedStorage.ID, file); - } + public boolean inBounds(int x, int y, int w, int h, int ox, int oy) { + return ox >= x && ox <= x + w && oy >= y && oy <= y + h; + } - public void bindTexture(String base, String file) - { - mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); - } + public void bindTexture(String file) { + bindTexture(RefinedStorage.ID, file); + } - public void drawItem(int x, int y, ItemStack stack) - { - drawItem(x, y, stack, false, null); - } + public void bindTexture(String base, String file) { + mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); + } - public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) - { - drawItem(x, y, stack, withOverlay, null); - } + public void drawItem(int x, int y, ItemStack stack) { + drawItem(x, y, stack, false, null); + } - public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) - { - zLevel = 200.0F; - itemRender.zLevel = 200.0F; + public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) { + drawItem(x, y, stack, withOverlay, null); + } - FontRenderer font = null; + public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) { + zLevel = 200.0F; + itemRender.zLevel = 200.0F; - if (stack != null) - { - font = stack.getItem().getFontRenderer(stack); - } + FontRenderer font = null; - if (font == null) - { - font = fontRendererObj; - } + if (stack != null) { + font = stack.getItem().getFontRenderer(stack); + } - itemRender.renderItemIntoGUI(stack, x, y); + if (font == null) { + font = fontRendererObj; + } - if (withOverlay) - { - itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); - } + itemRender.renderItemIntoGUI(stack, x, y); - zLevel = 0.0F; - itemRender.zLevel = 0.0F; - } + if (withOverlay) { + itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); + } - public void drawString(int x, int y, String message) - { - drawString(x, y, message, 4210752); - } + zLevel = 0.0F; + itemRender.zLevel = 0.0F; + } - public void drawString(int x, int y, String message, int color) - { - GL11.glDisable(GL11.GL_LIGHTING); - fontRendererObj.drawString(message, x, y, color); - GL11.glEnable(GL11.GL_LIGHTING); - } + public void drawString(int x, int y, String message) { + drawString(x, y, message, 4210752); + } - public void drawTooltip(int x, int y, String message) - { - GL11.glDisable(GL11.GL_LIGHTING); - drawHoveringText(Arrays.asList(message.split("\n")), x, y); - GL11.glEnable(GL11.GL_LIGHTING); - } + public void drawString(int x, int y, String message, int color) { + GL11.glDisable(GL11.GL_LIGHTING); + fontRendererObj.drawString(message, x, y, color); + GL11.glEnable(GL11.GL_LIGHTING); + } - public void drawTooltip(int x, int y, ItemStack stack) - { - renderToolTip(stack, x, y); - } + public void drawTooltip(int x, int y, String message) { + GL11.glDisable(GL11.GL_LIGHTING); + drawHoveringText(Arrays.asList(message.split("\n")), x, y); + GL11.glEnable(GL11.GL_LIGHTING); + } - public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) - { - drawTexturedModalRect(x, y, textureX, textureY, width, height); - } + public void drawTooltip(int x, int y, ItemStack stack) { + renderToolTip(stack, x, y); + } - public String t(String name, Object... format) - { - return I18n.translateToLocalFormatted(name, format); - } + public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) { + drawTexturedModalRect(x, y, textureX, textureY, width, height); + } - public abstract void init(int x, int y); + public String t(String name, Object... format) { + return I18n.translateToLocalFormatted(name, format); + } - public abstract void update(int x, int y); + public abstract void init(int x, int y); - public abstract void drawBackground(int x, int y, int mouseX, int mouseY); + public abstract void update(int x, int y); - public abstract void drawForeground(int mouseX, int mouseY); + public abstract void drawBackground(int x, int y, int mouseX, int mouseY); + + public abstract void drawForeground(int mouseX, int mouseY); } diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java old mode 100644 new mode 100755 index d55805eb7..2b53fa43e --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -6,43 +6,37 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileConstructor; import refinedstorage.util.InventoryUtils; -public class GuiConstructor extends GuiBase -{ - private TileConstructor constructor; +public class GuiConstructor extends GuiBase { + private TileConstructor constructor; - public GuiConstructor(ContainerConstructor container, TileConstructor constructor) - { - super(container, 176, 137); + public GuiConstructor(ContainerConstructor container, TileConstructor constructor) { + super(container, 176, 137); - this.constructor = constructor; - } + this.constructor = constructor; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(constructor)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(constructor)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/constructor.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/constructor.png"); - drawTexture(x, y, 0, 0, width, height); - } + 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")); - } + @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/refinedstorage/gui/GuiController.java old mode 100644 new mode 100755 index bdb61faa3..62f7548bc --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -9,112 +9,97 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; import refinedstorage.tile.TileMachine; -public class GuiController extends GuiBase -{ - private TileController controller; +public class GuiController extends GuiBase { + private TileController controller; - private int barX = 8; - private int barY = 20; - private int barWidth = 16; - private int barHeight = 59; + private int barX = 8; + private int barY = 20; + private int barWidth = 16; + private int barHeight = 59; - private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); + private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); - public GuiController(ContainerController container, TileController controller) - { - super(container, 176, 181); + public GuiController(ContainerController container, TileController controller) { + super(container, 176, 181); - this.controller = controller; - } + this.controller = controller; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(controller)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(controller)); + } - @Override - public void update(int x, int y) - { - scrollbar.setCanScroll(getRows() > getVisibleRows()); - } + @Override + public void update(int x, int y) { + scrollbar.setCanScroll(getRows() > getVisibleRows()); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/controller.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/controller.png"); - drawTexture(x, y, 0, 0, width, height); + drawTexture(x, y, 0, 0, width, height); - int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); + int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); - scrollbar.draw(this); - } + scrollbar.draw(this); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - scrollbar.update(this, mouseX, mouseY); + @Override + public void drawForeground(int mouseX, int mouseY) { + scrollbar.update(this, mouseX, mouseY); - drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); - drawString(7, 87, t("container.inventory")); + drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); + drawString(7, 87, t("container.inventory")); - int x = 33; - int y = 26; + int x = 33; + int y = 26; - int slot = getOffset() * 2; + int slot = getOffset() * 2; - RenderHelper.enableGUIStandardItemLighting(); + RenderHelper.enableGUIStandardItemLighting(); - for (int i = 0; i < 4; ++i) - { - if (slot < controller.getMachines().size()) - { - TileMachine machine = controller.getMachines().get(slot); - IBlockState machineState = machine.getWorld().getBlockState(machine.getPos()); - Block machineBlock = machineState.getBlock(); + for (int i = 0; i < 4; ++i) { + if (slot < controller.getMachines().size()) { + TileMachine machine = controller.getMachines().get(slot); + IBlockState machineState = machine.getWorld().getBlockState(machine.getPos()); + Block machineBlock = machineState.getBlock(); - ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); + ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); - drawItem(x, y, machineStack); - drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); - } + drawItem(x, y, machineStack); + drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); + } - if (i == 1) - { - x = 33; - y += 30; - } - else - { - x += 60; - } + if (i == 1) { + x = 33; + y += 30; + } else { + x += 60; + } - slot++; - } + slot++; + } - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); - } - } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); + } + } - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); - } + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); + } - private int getRows() - { - int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); + private int getRows() { + int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); - return max < 0 ? 0 : max; - } + return max < 0 ? 0 : max; + } - private int getVisibleRows() - { - return 2; - } + private int getVisibleRows() { + return 2; + } } diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java old mode 100644 new mode 100755 index 4194a0be0..247a1ed0b --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -4,40 +4,34 @@ import refinedstorage.container.ContainerDestructor; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; -public class GuiDestructor extends GuiBase -{ - private TileDestructor destructor; +public class GuiDestructor extends GuiBase { + private TileDestructor destructor; - public GuiDestructor(ContainerDestructor container, TileDestructor destructor) - { - super(container, 176, 131); + public GuiDestructor(ContainerDestructor container, TileDestructor destructor) { + super(container, 176, 131); - this.destructor = destructor; - } + this.destructor = destructor; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(destructor)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(destructor)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/destructor.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/destructor.png"); - drawTexture(x, y, 0, 0, width, height); - } + drawTexture(x, y, 0, 0, width, height); + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:destructor")); - drawString(7, 39, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:destructor")); + drawString(7, 39, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java old mode 100644 new mode 100755 index bd4c5abf4..f788fa343 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -1,7 +1,6 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; -import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import refinedstorage.RefinedStorage; import refinedstorage.container.ContainerDetector; @@ -11,73 +10,64 @@ import refinedstorage.network.MessageDetectorAmountUpdate; import refinedstorage.tile.TileDetector; import refinedstorage.util.InventoryUtils; -public class GuiDetector extends GuiBase -{ - private TileDetector detector; +import java.io.IOException; - private GuiTextField amountField; +public class GuiDetector extends GuiBase { + private TileDetector detector; - public GuiDetector(ContainerDetector container, TileDetector detector) - { - super(container, 176, 137); + private GuiTextField amountField; - this.detector = detector; - } + public GuiDetector(ContainerDetector container, TileDetector detector) { + super(container, 176, 137); - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); + this.detector = detector; + } - addSideButton(new SideButtonDetectorMode(detector)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); - amountField = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 25, fontRendererObj.FONT_HEIGHT); - amountField.setText(String.valueOf(detector.getAmount())); - amountField.setEnableBackgroundDrawing(false); - amountField.setVisible(true); - amountField.setTextColor(16777215); - amountField.setCanLoseFocus(false); - amountField.setFocused(true); - } + addSideButton(new SideButtonDetectorMode(detector)); - @Override - public void update(int x, int y) - { - } + amountField = new GuiTextField(0, fontRendererObj, x + 62 + 1, y + 23 + 1, 25, fontRendererObj.FONT_HEIGHT); + amountField.setText(String.valueOf(detector.getAmount())); + amountField.setEnableBackgroundDrawing(false); + amountField.setVisible(true); + amountField.setTextColor(16777215); + amountField.setCanLoseFocus(false); + amountField.setFocused(true); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/detector.png"); + @Override + public void update(int x, int y) { + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/detector.png"); - amountField.drawTextBox(); - } + drawTexture(x, y, 0, 0, width, height); - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:detector")); - drawString(7, 43, t("container.inventory")); - } + amountField.drawTextBox(); + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) - { - Integer result = Ints.tryParse(amountField.getText()); + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:detector")); + drawString(7, 43, t("container.inventory")); + } - if (result != null) - { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); - } - } - else - { - super.keyTyped(character, keyCode); - } - } + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && amountField.textboxKeyTyped(character, keyCode)) { + Integer result = Ints.tryParse(amountField.getText()); + + if (result != null) { + RefinedStorage.NETWORK.sendToServer(new MessageDetectorAmountUpdate(detector, result)); + } + } else { + super.keyTyped(character, keyCode); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java old mode 100644 new mode 100755 index 364121ec9..42287109e --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -6,43 +6,37 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileExporter; import refinedstorage.util.InventoryUtils; -public class GuiExporter extends GuiBase -{ - private TileExporter exporter; +public class GuiExporter extends GuiBase { + private TileExporter exporter; - public GuiExporter(ContainerExporter container, TileExporter exporter) - { - super(container, 176, 137); + public GuiExporter(ContainerExporter container, TileExporter exporter) { + super(container, 176, 137); - this.exporter = exporter; - } + this.exporter = exporter; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(exporter)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(exporter)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/exporter.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/exporter.png"); - drawTexture(x, y, 0, 0, width, height); - } + 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")); - } + @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/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java old mode 100644 new mode 100755 index 27b6b5c09..3ce054d61 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -1,10 +1,5 @@ package refinedstorage.gui; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; @@ -25,333 +20,274 @@ import refinedstorage.storage.StorageItem; import refinedstorage.tile.TileController; import refinedstorage.tile.TileGrid; -public class GuiGrid extends GuiBase -{ - private ContainerGrid container; - private TileGrid grid; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; - private GuiTextField searchField; +public class GuiGrid extends GuiBase { + private ContainerGrid container; + private TileGrid grid; - private int hoveringSlotId; - private int hoveringId; + private GuiTextField searchField; - private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); + private int hoveringSlotId; + private int hoveringId; - public GuiGrid(ContainerGrid container, TileGrid grid) - { - super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); + private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); - this.container = container; - this.grid = grid; - } + public GuiGrid(ContainerGrid container, TileGrid grid) { + super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(grid)); + this.container = container; + this.grid = grid; + } - addSideButton(new SideButtonGridSortingDirection(grid)); - addSideButton(new SideButtonGridSortingType(grid)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(grid)); - searchField = new GuiTextField(0, fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT); - searchField.setEnableBackgroundDrawing(false); - searchField.setVisible(true); - searchField.setTextColor(16777215); - searchField.setCanLoseFocus(false); - searchField.setFocused(true); - } + addSideButton(new SideButtonGridSortingDirection(grid)); + addSideButton(new SideButtonGridSortingType(grid)); - @Override - public void update(int x, int y) - { - scrollbar.setCanScroll(getRows() > getVisibleRows()); - } + searchField = new GuiTextField(0, fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT); + searchField.setEnableBackgroundDrawing(false); + searchField.setVisible(true); + searchField.setTextColor(16777215); + searchField.setCanLoseFocus(false); + searchField.setFocused(true); + } - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); - } + @Override + public void update(int x, int y) { + scrollbar.setCanScroll(getRows() > getVisibleRows()); + } - public int getVisibleRows() - { - return 4; - } + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); + } - public int getRows() - { - if (!grid.isConnected()) - { - return 0; - } + public int getVisibleRows() { + return 4; + } - int max = (int) Math.ceil((float) getItems().size() / (float) 9); + public int getRows() { + if (!grid.isConnected()) { + return 0; + } - return max < 0 ? 0 : max; - } + int max = (int) Math.ceil((float) getItems().size() / (float) 9); - private boolean isHoveringOverValidSlot(List items) - { - return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); - } + return max < 0 ? 0 : max; + } - private boolean isHoveringOverSlot() - { - return hoveringSlotId >= 0; - } + private boolean isHoveringOverValidSlot(List items) { + return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); + } - public boolean isHoveringOverClear(int mouseX, int mouseY) - { - if (grid.getType() == EnumGridType.CRAFTING) - { - return inBounds(81, 105, 7, 7, mouseX, mouseY); - } + private boolean isHoveringOverSlot() { + return hoveringSlotId >= 0; + } - return false; - } + public boolean isHoveringOverClear(int mouseX, int mouseY) { + if (grid.getType() == EnumGridType.CRAFTING) { + return inBounds(81, 105, 7, 7, mouseX, mouseY); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - if (grid.getType() == EnumGridType.CRAFTING) - { - bindTexture("gui/crafting_grid.png"); - } - else - { - bindTexture("gui/grid.png"); - } + return false; + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + if (grid.getType() == EnumGridType.CRAFTING) { + bindTexture("gui/crafting_grid.png"); + } else { + bindTexture("gui/grid.png"); + } - scrollbar.draw(this); + drawTexture(x, y, 0, 0, width, height); - searchField.drawTextBox(); - } + scrollbar.draw(this); - @Override - public void drawForeground(int mouseX, int mouseY) - { - scrollbar.update(this, mouseX, mouseY); + searchField.drawTextBox(); + } - drawString(7, 7, t("gui.refinedstorage:grid")); + @Override + public void drawForeground(int mouseX, int mouseY) { + scrollbar.update(this, mouseX, mouseY); - if (grid.getType() == EnumGridType.CRAFTING) - { - drawString(7, 94, t("container.crafting")); - } + drawString(7, 7, t("gui.refinedstorage:grid")); - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, t("container.inventory")); + if (grid.getType() == EnumGridType.CRAFTING) { + drawString(7, 94, t("container.crafting")); + } - int x = 8; - int y = 20; + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, t("container.inventory")); - List items = getItems(); + int x = 8; + int y = 20; - hoveringSlotId = -1; + List items = getItems(); - int slot = getOffset() * 9; + hoveringSlotId = -1; - RenderHelper.enableGUIStandardItemLighting(); + int slot = getOffset() * 9; - for (int i = 0; i < 9 * getVisibleRows(); ++i) - { - if (slot < items.size()) - { - int qty = items.get(slot).getQuantity(); + RenderHelper.enableGUIStandardItemLighting(); - String text; + for (int i = 0; i < 9 * getVisibleRows(); ++i) { + if (slot < items.size()) { + int qty = items.get(slot).getQuantity(); - if (qty >= 1000000) - { - text = String.valueOf((int) Math.floor(qty / 1000000)) + "M"; - } - else if (qty >= 1000) - { - text = String.valueOf((int) Math.floor(qty / 1000)) + "K"; - } - else if (qty == 1) - { - text = null; - } - else - { - text = String.valueOf(qty); - } + String text; - drawItem(x, y, items.get(slot).toItemStack(), true, text); - } + if (qty >= 1000000) { + text = String.valueOf((int) Math.floor(qty / 1000000)) + "M"; + } else if (qty >= 1000) { + text = String.valueOf((int) Math.floor(qty / 1000)) + "K"; + } else if (qty == 1) { + text = null; + } else { + text = String.valueOf(qty); + } - if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) - { - hoveringSlotId = slot; + drawItem(x, y, items.get(slot).toItemStack(), true, text); + } - if (slot < items.size()) - { - // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); - } + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlotId = slot; - int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; + if (slot < items.size()) { + // We need to use the ID, because if we filter, the client-side index will change + // while the serverside's index will still be the same. + hoveringId = items.get(slot).getId(); + } - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - zLevel = 190; - GlStateManager.colorMask(true, true, true, false); - drawGradientRect(x, y, x + 16, y + 16, color, color); - zLevel = 0; - GlStateManager.colorMask(true, true, true, true); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); - } + int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; - slot++; + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + zLevel = 190; + GlStateManager.colorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, color, color); + zLevel = 0; + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); + } - x += 18; + slot++; - if ((i + 1) % 9 == 0) - { - x = 8; - y += 18; - } - } + x += 18; - if (isHoveringOverValidSlot(items)) - { - drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); - } + if ((i + 1) % 9 == 0) { + x = 8; + y += 18; + } + } - if (isHoveringOverClear(mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); - } - } + if (isHoveringOverValidSlot(items)) { + drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); + } - public List getItems() - { - List items = new ArrayList(); + if (isHoveringOverClear(mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); + } + } - if (!grid.isConnected()) - { - return items; - } + public List getItems() { + List items = new ArrayList(); - items.addAll(grid.getController().getItems()); + if (!grid.isConnected()) { + return items; + } - if (!searchField.getText().trim().isEmpty()) - { - Iterator t = items.iterator(); + items.addAll(grid.getController().getItems()); - while (t.hasNext()) - { - StorageItem item = t.next(); + if (!searchField.getText().trim().isEmpty()) { + Iterator t = items.iterator(); - if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) - { - t.remove(); - } - } - } + while (t.hasNext()) { + StorageItem item = t.next(); - items.sort(new Comparator() - { - @Override - public int compare(StorageItem o1, StorageItem o2) - { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) - { - return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); - } - else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) - { - return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); - } + if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { + t.remove(); + } + } + } - return 0; - } - }); + items.sort(new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + } - if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) - { - items.sort(new Comparator() - { - @Override - public int compare(StorageItem o1, StorageItem o2) - { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) - { - return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); - } - else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) - { - return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); - } + return 0; + } + }); - return 0; - } - }); - } + if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { + items.sort(new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + } - return items; - } + return 0; + } + }); + } - @Override - public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException - { - super.mouseClicked(mouseX, mouseY, clickedButton); + return items; + } - boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); + @Override + public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException { + super.mouseClicked(mouseX, mouseY, clickedButton); - if (grid.isConnected()) - { - TileController controller = grid.getController(); + boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); - if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) - { - RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); - } - else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) - { - boolean half = clickedButton == 1; - boolean shift = GuiScreen.isShiftKeyDown(); - boolean one = clickedButton == 2; + if (grid.isConnected()) { + TileController controller = grid.getController(); - RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); - } - else if (clickedClear) - { - RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); - } - else - { - for (Slot slot : container.getPlayerInventorySlots()) - { - if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) - { - if (GuiScreen.isShiftKeyDown()) - { - RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); - } - } - } - } - } + if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) { + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); + } else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) { + boolean half = clickedButton == 1; + boolean shift = GuiScreen.isShiftKeyDown(); + boolean one = clickedButton == 2; - if (clickedClear) - { - mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.ui_button_click, 1.0F)); - } - } + RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); + } else if (clickedClear) { + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); + } else { + for (Slot slot : container.getPlayerInventorySlots()) { + if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { + if (GuiScreen.isShiftKeyDown()) { + RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), slot.slotNumber, clickedButton == 1)); + } + } + } + } + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) - { - } - else - { - super.keyTyped(character, keyCode); - } - } + if (clickedClear) { + mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.ui_button_click, 1.0F)); + } + } + + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && searchField.textboxKeyTyped(character, keyCode)) { + } else { + super.keyTyped(character, keyCode); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java old mode 100644 new mode 100755 index 11b33452a..5273c3602 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -11,84 +11,78 @@ import refinedstorage.container.*; import refinedstorage.storage.IStorageGui; import refinedstorage.tile.*; -public class GuiHandler implements IGuiHandler -{ - private Container getContainer(int ID, EntityPlayer player, TileEntity tile) - { - switch (ID) - { - case RefinedStorageGui.CONTROLLER: - return new ContainerController(player); - case RefinedStorageGui.GRID: - return new ContainerGrid(player, (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new ContainerDrive(player, (TileDrive) tile); - case RefinedStorageGui.IMPORTER: - return new ContainerImporter(player, (TileImporter) tile); - case RefinedStorageGui.EXPORTER: - return new ContainerExporter(player, (TileExporter) tile); - case RefinedStorageGui.DETECTOR: - return new ContainerDetector(player, (TileDetector) tile); - case RefinedStorageGui.SOLDERER: - return new ContainerSolderer(player, (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); - case RefinedStorageGui.DESTRUCTOR: - return new ContainerDestructor(player); - case RefinedStorageGui.CONSTRUCTOR: - return new ContainerConstructor(player, (TileConstructor) tile); - case RefinedStorageGui.STORAGE: - return new ContainerStorage(player, ((IStorageGui) tile).getInventory()); - case RefinedStorageGui.RELAY: - return new ContainerRelay(player); - case RefinedStorageGui.INTERFACE: - return new ContainerInterface(player, (TileInterface) tile); - default: - return null; - } - } +public class GuiHandler implements IGuiHandler { + private Container getContainer(int ID, EntityPlayer player, TileEntity tile) { + switch (ID) { + case RefinedStorageGui.CONTROLLER: + return new ContainerController(player); + case RefinedStorageGui.GRID: + return new ContainerGrid(player, (TileGrid) tile); + case RefinedStorageGui.DRIVE: + return new ContainerDrive(player, (TileDrive) tile); + case RefinedStorageGui.IMPORTER: + return new ContainerImporter(player, (TileImporter) tile); + case RefinedStorageGui.EXPORTER: + return new ContainerExporter(player, (TileExporter) tile); + case RefinedStorageGui.DETECTOR: + return new ContainerDetector(player, (TileDetector) tile); + case RefinedStorageGui.SOLDERER: + return new ContainerSolderer(player, (TileSolderer) tile); + case RefinedStorageGui.WIRELESS_TRANSMITTER: + return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); + case RefinedStorageGui.DESTRUCTOR: + return new ContainerDestructor(player); + case RefinedStorageGui.CONSTRUCTOR: + return new ContainerConstructor(player, (TileConstructor) tile); + case RefinedStorageGui.STORAGE: + return new ContainerStorage(player, ((IStorageGui) tile).getInventory()); + case RefinedStorageGui.RELAY: + return new ContainerRelay(player); + case RefinedStorageGui.INTERFACE: + return new ContainerInterface(player, (TileInterface) tile); + default: + return null; + } + } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - return getContainer(ID, player, world.getTileEntity(new BlockPos(x, y, z))); - } + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return getContainer(ID, player, world.getTileEntity(new BlockPos(x, y, z))); + } - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); - switch (ID) - { - case RefinedStorageGui.CONTROLLER: - return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); - case RefinedStorageGui.GRID: - return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/drive.png"); - case RefinedStorageGui.IMPORTER: - return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); - case RefinedStorageGui.EXPORTER: - return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); - case RefinedStorageGui.DETECTOR: - return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); - case RefinedStorageGui.SOLDERER: - return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); - case RefinedStorageGui.DESTRUCTOR: - return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); - case RefinedStorageGui.CONSTRUCTOR: - return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); - case RefinedStorageGui.STORAGE: - return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); - case RefinedStorageGui.RELAY: - return new GuiRelay((ContainerRelay) getContainer(ID, player, tile), (TileRelay) tile); - case RefinedStorageGui.INTERFACE: - return new GuiInterface((ContainerInterface) getContainer(ID, player, tile), (TileInterface) tile); - default: - return null; - } - } + switch (ID) { + case RefinedStorageGui.CONTROLLER: + return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); + case RefinedStorageGui.GRID: + return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); + case RefinedStorageGui.DRIVE: + return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/drive.png"); + case RefinedStorageGui.IMPORTER: + return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); + case RefinedStorageGui.EXPORTER: + return new GuiExporter((ContainerExporter) getContainer(ID, player, tile), (TileExporter) tile); + case RefinedStorageGui.DETECTOR: + return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); + case RefinedStorageGui.SOLDERER: + return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); + case RefinedStorageGui.WIRELESS_TRANSMITTER: + return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); + case RefinedStorageGui.DESTRUCTOR: + return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); + case RefinedStorageGui.CONSTRUCTOR: + return new GuiConstructor((ContainerConstructor) getContainer(ID, player, tile), (TileConstructor) tile); + case RefinedStorageGui.STORAGE: + return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile); + case RefinedStorageGui.RELAY: + return new GuiRelay((ContainerRelay) getContainer(ID, player, tile), (TileRelay) tile); + case RefinedStorageGui.INTERFACE: + return new GuiInterface((ContainerInterface) getContainer(ID, player, tile), (TileInterface) tile); + default: + return null; + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java old mode 100644 new mode 100755 index 398cd8757..521168749 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -7,45 +7,39 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileImporter; import refinedstorage.util.InventoryUtils; -public class GuiImporter extends GuiBase -{ - private TileImporter importer; +public class GuiImporter extends GuiBase { + private TileImporter importer; - public GuiImporter(ContainerImporter container, TileImporter importer) - { - super(container, 176, 137); + public GuiImporter(ContainerImporter container, TileImporter importer) { + super(container, 176, 137); - this.importer = importer; - } + this.importer = importer; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(importer)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(importer)); - addSideButton(new SideButtonMode(importer)); + addSideButton(new SideButtonMode(importer)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/importer.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/importer.png"); - drawTexture(x, y, 0, 0, width, height); - } + 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")); - } + @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/refinedstorage/gui/GuiInterface.java old mode 100644 new mode 100755 index d7deb39a1..2a402f3a6 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -6,53 +6,46 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileInterface; import refinedstorage.util.InventoryUtils; -public class GuiInterface extends GuiBase -{ - private TileInterface tile; +public class GuiInterface extends GuiBase { + private TileInterface tile; - public GuiInterface(ContainerInterface container, TileInterface tile) - { - super(container, 176, 218); + public GuiInterface(ContainerInterface container, TileInterface tile) { + super(container, 176, 218); - this.tile = tile; - } + this.tile = tile; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(tile)); + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(tile)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_NBT)); - } + addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/interface.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/interface.png"); - drawTexture(x, y, 0, 0, width, height); - } + 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, 123, t("container.inventory")); + @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, 123, t("container.inventory")); - if (inBounds(162, 42, 7, 7, mouseX, mouseY)) - { - String message = t("gui.refinedstorage:interface.export.explanation.0"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.1"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.2"); + if (inBounds(162, 42, 7, 7, mouseX, mouseY)) { + String message = t("gui.refinedstorage:interface.export.explanation.0"); + message += "\n" + t("gui.refinedstorage:interface.export.explanation.1"); + message += "\n" + t("gui.refinedstorage:interface.export.explanation.2"); - drawTooltip(mouseX, mouseY, message); - } - } + drawTooltip(mouseX, mouseY, message); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiRelay.java b/src/main/java/refinedstorage/gui/GuiRelay.java old mode 100644 new mode 100755 index e1cfefd9e..b50810d9b --- a/src/main/java/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/refinedstorage/gui/GuiRelay.java @@ -4,40 +4,34 @@ import refinedstorage.container.ContainerRelay; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileRelay; -public class GuiRelay extends GuiBase -{ - private TileRelay relay; +public class GuiRelay extends GuiBase { + private TileRelay relay; - public GuiRelay(ContainerRelay container, TileRelay relay) - { - super(container, 176, 131); + public GuiRelay(ContainerRelay container, TileRelay relay) { + super(container, 176, 131); - this.relay = relay; - } + this.relay = relay; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(relay)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(relay)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/relay.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/relay.png"); - drawTexture(x, y, 0, 0, width, height); - } + 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")); - } + @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/refinedstorage/gui/GuiSolderer.java old mode 100644 new mode 100755 index 01903ac42..f487e70bb --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -4,45 +4,38 @@ import net.minecraft.inventory.Container; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; -public class GuiSolderer extends GuiBase -{ - private TileSolderer solderer; +public class GuiSolderer extends GuiBase { + private TileSolderer solderer; - public GuiSolderer(Container container, TileSolderer solderer) - { - super(container, 176, 177); + public GuiSolderer(Container container, TileSolderer solderer) { + super(container, 176, 177); - this.solderer = solderer; - } + this.solderer = solderer; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(solderer)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(solderer)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/solderer.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/solderer.png"); - drawTexture(x, y, 0, 0, width, height); + drawTexture(x, y, 0, 0, width, height); - if (solderer.isWorking()) - { - drawTexture(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); - } - } + if (solderer.isWorking()) { + drawTexture(x + 83, y + 40 - 1, 177, 0, solderer.getProgressScaled(22), 15); + } + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:solderer")); - drawString(7, 82, t("container.inventory")); - } + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:solderer")); + drawString(7, 82, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java old mode 100644 new mode 100755 index ad60dacb6..f6f1bd1de --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -1,7 +1,6 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; -import java.io.IOException; import net.minecraft.client.gui.GuiTextField; import refinedstorage.container.ContainerStorage; import refinedstorage.gui.sidebutton.SideButtonCompare; @@ -10,114 +9,99 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.storage.IStorageGui; import refinedstorage.util.InventoryUtils; -public class GuiStorage extends GuiBase -{ - private IStorageGui gui; - private String texture; +import java.io.IOException; - private GuiTextField priorityField; +public class GuiStorage extends GuiBase { + private IStorageGui gui; + private String texture; - private int barX = 8; - private int barY = 54; - private int barWidth = 16; - private int barHeight = 58; + private GuiTextField priorityField; - public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) - { - super(container, 176, 211); + private int barX = 8; + private int barY = 54; + private int barWidth = 16; + private int barHeight = 58; - this.gui = gui; - this.texture = texture; - } + public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) { + super(container, 176, 211); - public GuiStorage(ContainerStorage container, IStorageGui gui) - { - this(container, gui, "gui/storage.png"); - } + this.gui = gui; + this.texture = texture; + } - @Override - public void init(int x, int y) - { - if (gui.getRedstoneModeSetting() != null) - { - addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); - } + public GuiStorage(ContainerStorage container, IStorageGui gui) { + this(container, gui, "gui/storage.png"); + } - if (gui.getModeSetting() != null) - { - addSideButton(new SideButtonMode(gui.getModeSetting())); - } + @Override + public void init(int x, int y) { + if (gui.getRedstoneModeSetting() != null) { + addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); + } - if (gui.getCompareSetting() != null) - { - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); - } + if (gui.getModeSetting() != null) { + addSideButton(new SideButtonMode(gui.getModeSetting())); + } - priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT); - priorityField.setText(String.valueOf(gui.getPriority())); - priorityField.setEnableBackgroundDrawing(false); - priorityField.setVisible(true); - priorityField.setTextColor(16777215); - priorityField.setCanLoseFocus(false); - priorityField.setFocused(true); - } + if (gui.getCompareSetting() != null) { + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); + } - @Override - public void update(int x, int y) - { - } + priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT); + priorityField.setText(String.valueOf(gui.getPriority())); + priorityField.setEnableBackgroundDrawing(false); + priorityField.setVisible(true); + priorityField.setTextColor(16777215); + priorityField.setCanLoseFocus(false); + priorityField.setFocused(true); + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture(texture); + @Override + public void update(int x, int y) { + } - drawTexture(x, y, 0, 0, width, height); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture(texture); - int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); + drawTexture(x, y, 0, 0, width, height); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); - priorityField.drawTextBox(); - } + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t(gui.getName())); - 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")); + priorityField.drawTextBox(); + } - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) - { - int full = 0; + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t(gui.getName())); + 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 (gui.getCapacity() >= 0) - { - full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); - } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + int full = 0; - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); - } - } + if (gui.getCapacity() >= 0) { + full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); + } - @Override - protected void keyTyped(char character, int keyCode) throws IOException - { - if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) - { - Integer result = Ints.tryParse(priorityField.getText()); + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); + } + } - if (result != null) - { - gui.onPriorityChanged(result); - } - } - else - { - super.keyTyped(character, keyCode); - } - } + @Override + protected void keyTyped(char character, int keyCode) throws IOException { + if (!checkHotbarKeys(keyCode) && priorityField.textboxKeyTyped(character, keyCode)) { + Integer result = Ints.tryParse(priorityField.getText()); + + if (result != null) { + gui.onPriorityChanged(result); + } + } else { + super.keyTyped(character, keyCode); + } + } } diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java old mode 100644 new mode 100755 index 530cf0681..2b431717a --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -4,54 +4,46 @@ import net.minecraft.inventory.Container; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; -public class GuiWirelessTransmitter extends GuiBase -{ - private TileWirelessTransmitter wirelessTransmitter; +public class GuiWirelessTransmitter extends GuiBase { + private TileWirelessTransmitter wirelessTransmitter; - public GuiWirelessTransmitter(Container container, TileWirelessTransmitter wirelessTransmitter) - { - super(container, 176, 137); + public GuiWirelessTransmitter(Container container, TileWirelessTransmitter wirelessTransmitter) { + super(container, 176, 137); - this.wirelessTransmitter = wirelessTransmitter; - } + this.wirelessTransmitter = wirelessTransmitter; + } - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(wirelessTransmitter)); - } + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(wirelessTransmitter)); + } - @Override - public void update(int x, int y) - { - } + @Override + public void update(int x, int y) { + } - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/wireless_transmitter.png"); + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/wireless_transmitter.png"); - drawTexture(x, y, 0, 0, width, height); + drawTexture(x, y, 0, 0, width, height); - if (wirelessTransmitter.isWorking()) - { - int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); + if (wirelessTransmitter.isWorking()) { + int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); - drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); - } - } + drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); + } + } - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:wireless_transmitter")); - drawString(7, 43, t("container.inventory")); + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:wireless_transmitter")); + drawString(7, 43, t("container.inventory")); - if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking()) - { - int workRemaining = (int) (((float) (TileWirelessTransmitter.TOTAL_PROGRESS - wirelessTransmitter.getProgress())) / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 100f); + if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking()) { + int workRemaining = (int) (((float) (TileWirelessTransmitter.TOTAL_PROGRESS - wirelessTransmitter.getProgress())) / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 100f); - drawTooltip(mouseX, mouseY, workRemaining + "%"); - } - } + drawTooltip(mouseX, mouseY, workRemaining + "%"); + } + } } diff --git a/src/main/java/refinedstorage/gui/Scrollbar.java b/src/main/java/refinedstorage/gui/Scrollbar.java old mode 100644 new mode 100755 index 6a1fe734c..f79aa0dcf --- a/src/main/java/refinedstorage/gui/Scrollbar.java +++ b/src/main/java/refinedstorage/gui/Scrollbar.java @@ -2,110 +2,91 @@ package refinedstorage.gui; import org.lwjgl.input.Mouse; -public class Scrollbar -{ - private boolean canScroll = true; +public class Scrollbar { + private boolean canScroll = true; - private int x; - private int y; - private int scrollbarWidth; - private int scrollbarHeight; + private int x; + private int y; + private int scrollbarWidth; + private int scrollbarHeight; - private float currentScroll; - private boolean wasClicking = false; - private boolean isScrolling = false; + private float currentScroll; + private boolean wasClicking = false; + private boolean isScrolling = false; - public Scrollbar(int x, int y, int scrollbarWidth, int scrollbarHeight) - { - this.x = x; - this.y = y; - this.scrollbarWidth = scrollbarWidth; - this.scrollbarHeight = scrollbarHeight; - } + public Scrollbar(int x, int y, int scrollbarWidth, int scrollbarHeight) { + this.x = x; + this.y = y; + this.scrollbarWidth = scrollbarWidth; + this.scrollbarHeight = scrollbarHeight; + } - public void setCanScroll(boolean canScroll) - { - this.canScroll = canScroll; - } + public void setCanScroll(boolean canScroll) { + this.canScroll = canScroll; + } - public boolean canScroll() - { - return canScroll; - } + public boolean canScroll() { + return canScroll; + } - public float getCurrentScroll() - { - return currentScroll; - } + public float getCurrentScroll() { + return currentScroll; + } - public void setCurrentScroll(float newCurrentScroll) - { - if (newCurrentScroll < 0) - { - newCurrentScroll = 0; - } + public void setCurrentScroll(float newCurrentScroll) { + if (newCurrentScroll < 0) { + newCurrentScroll = 0; + } - int scrollbarItselfHeight = 12; + int scrollbarItselfHeight = 12; - int max = scrollbarHeight - scrollbarItselfHeight - 3; + int max = scrollbarHeight - scrollbarItselfHeight - 3; - if (newCurrentScroll > max) - { - newCurrentScroll = max; - } + if (newCurrentScroll > max) { + newCurrentScroll = max; + } - currentScroll = newCurrentScroll; - } + currentScroll = newCurrentScroll; + } - public void draw(GuiBase gui) - { - gui.bindTexture("icons.png"); - gui.drawTexture(gui.guiLeft + x, gui.guiTop + y + (int) currentScroll, canScroll() ? 232 : 244, 0, 12, 15); - } + public void draw(GuiBase gui) { + gui.bindTexture("icons.png"); + gui.drawTexture(gui.guiLeft + x, gui.guiTop + y + (int) currentScroll, canScroll() ? 232 : 244, 0, 12, 15); + } - public void update(GuiBase gui, int mouseX, int mouseY) - { - if (!canScroll()) - { - isScrolling = false; - wasClicking = false; - currentScroll = 0; - } - else - { - int wheel = Mouse.getDWheel(); + public void update(GuiBase gui, int mouseX, int mouseY) { + if (!canScroll()) { + isScrolling = false; + wasClicking = false; + currentScroll = 0; + } else { + int wheel = Mouse.getDWheel(); - wheel = Math.max(Math.min(-wheel, 1), -1); + wheel = Math.max(Math.min(-wheel, 1), -1); - float delta = 15; + float delta = 15; - if (wheel == -1) - { - setCurrentScroll(currentScroll - delta); - } - else if (wheel == 1) - { - setCurrentScroll(currentScroll + delta); - } + if (wheel == -1) { + setCurrentScroll(currentScroll - delta); + } else if (wheel == 1) { + setCurrentScroll(currentScroll + delta); + } - boolean down = Mouse.isButtonDown(0); + boolean down = Mouse.isButtonDown(0); - if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) - { - isScrolling = true; - } + if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) { + isScrolling = true; + } - if (!down) - { - isScrolling = false; - } + if (!down) { + isScrolling = false; + } - wasClicking = down; + wasClicking = down; - if (isScrolling) - { - setCurrentScroll(mouseY - 20); - } - } - } + if (isScrolling) { + setCurrentScroll(mouseY - 20); + } + } + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java old mode 100644 new mode 100755 index 6a1de411d..ce2e9faf0 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java @@ -2,45 +2,38 @@ package refinedstorage.gui.sidebutton; import refinedstorage.gui.GuiBase; -public abstract class SideButton -{ - private int id; - private int x; - private int y; +public abstract class SideButton { + private int id; + private int x; + private int y; - public int getId() - { - return id; - } + public int getId() { + return id; + } - public void setId(int id) - { - this.id = id; - } + public void setId(int id) { + this.id = id; + } - public int getX() - { - return x; - } + public int getX() { + return x; + } - public void setX(int x) - { - this.x = x; - } + public void setX(int x) { + this.x = x; + } - public int getY() - { - return y; - } + public int getY() { + return y; + } - public void setY(int y) - { - this.y = y; - } + public void setY(int y) { + this.y = y; + } - public abstract String getTooltip(GuiBase gui); + public abstract String getTooltip(GuiBase gui); - public abstract void draw(GuiBase gui, int x, int y); + public abstract void draw(GuiBase gui, int x, int y); - public abstract void actionPerformed(); + public abstract void actionPerformed(); } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java old mode 100644 new mode 100755 index 9180ad1c3..f2bde9452 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -7,60 +7,49 @@ import refinedstorage.network.MessageCompareUpdate; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class SideButtonCompare extends SideButton -{ - private ICompareSetting setting; - private int mask; +public class SideButtonCompare extends SideButton { + private ICompareSetting setting; + private int mask; - public SideButtonCompare(ICompareSetting setting, int mask) - { - this.setting = setting; - this.mask = mask; - } + public SideButtonCompare(ICompareSetting setting, int mask) { + this.setting = setting; + this.mask = mask; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n"); - if ((setting.getCompare() & mask) == mask) - { - builder.append(gui.t("misc.refinedstorage:yes")); - } - else - { - builder.append(gui.t("misc.refinedstorage:no")); - } + if ((setting.getCompare() & mask) == mask) { + builder.append(gui.t("misc.refinedstorage:yes")); + } else { + builder.append(gui.t("misc.refinedstorage:no")); + } - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); - int ty = 0; + int ty = 0; - if (mask == InventoryUtils.COMPARE_DAMAGE) - { - ty = 80; - } - else if (mask == InventoryUtils.COMPARE_NBT) - { - ty = 48; - } + if (mask == InventoryUtils.COMPARE_DAMAGE) { + ty = 80; + } else if (mask == InventoryUtils.COMPARE_NBT) { + ty = 48; + } - int tx = (setting.getCompare() & mask) == mask ? 0 : 16; + int tx = (setting.getCompare() & mask) == mask ? 0 : 16; - gui.drawTexture(x, y + 2, tx, ty, 16, 16); - } + gui.drawTexture(x, y + 2, tx, ty, 16, 16); + } - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageCompareUpdate(setting, setting.getCompare() ^ mask)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java old mode 100644 new mode 100755 index f7da67f5b..351c23594 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -8,36 +8,31 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageDetectorModeUpdate; import refinedstorage.tile.TileDetector; -public class SideButtonDetectorMode extends SideButton -{ - private TileDetector detector; +public class SideButtonDetectorMode extends SideButton { + private TileDetector detector; - public SideButtonDetectorMode(TileDetector detector) - { - this.detector = detector; - } + public SideButtonDetectorMode(TileDetector detector) { + this.detector = detector; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); + builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.drawItem(x, y, new ItemStack(Items.redstone, 1)); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.drawItem(x, y, new ItemStack(Items.redstone, 1)); + } - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java old mode 100644 new mode 100755 index f0f49dc48..92f6a0cbe --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -6,48 +6,40 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingDirection extends SideButton -{ - private TileGrid grid; +public class SideButtonGridSortingDirection extends SideButton { + private TileGrid grid; - public SideButtonGridSortingDirection(TileGrid grid) - { - this.grid = grid; - } + public SideButtonGridSortingDirection(TileGrid grid) { + this.grid = grid; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); + builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x, y + 2 - 1, grid.getSortingDirection() * 16, 16, 16, 16); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x, y + 2 - 1, grid.getSortingDirection() * 16, 16, 16, 16); + } - @Override - public void actionPerformed() - { - int dir = grid.getSortingDirection(); + @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; - } + if (dir == TileGrid.SORTING_DIRECTION_ASCENDING) { + dir = TileGrid.SORTING_DIRECTION_DESCENDING; + } else if (dir == TileGrid.SORTING_DIRECTION_DESCENDING) { + dir = TileGrid.SORTING_DIRECTION_ASCENDING; + } - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); - } + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java old mode 100644 new mode 100755 index 7403bc4a8..38ffc43d3 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -6,48 +6,40 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingType extends SideButton -{ - private TileGrid grid; +public class SideButtonGridSortingType extends SideButton { + private TileGrid grid; - public SideButtonGridSortingType(TileGrid grid) - { - this.grid = grid; - } + public SideButtonGridSortingType(TileGrid grid) { + this.grid = grid; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); + builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x - 1, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x - 1, y + 2 - 1, grid.getSortingType() * 16, 32, 16, 16); + } - @Override - public void actionPerformed() - { - int type = grid.getSortingType(); + @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; - } + if (type == TileGrid.SORTING_TYPE_QUANTITY) { + type = TileGrid.SORTING_TYPE_NAME; + } else if (type == TileGrid.SORTING_TYPE_NAME) { + type = TileGrid.SORTING_TYPE_QUANTITY; + } - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); - } + RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java old mode 100644 new mode 100755 index a251b2992..6191b47e1 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -6,49 +6,41 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageModeToggle; import refinedstorage.tile.settings.IModeSetting; -public class SideButtonMode extends SideButton -{ - private IModeSetting mode; +public class SideButtonMode extends SideButton { + private IModeSetting mode; - public SideButtonMode(IModeSetting mode) - { - this.mode = mode; - } + public SideButtonMode(IModeSetting mode) { + this.mode = mode; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); + builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); - int tx = 0; + int tx = 0; - if (mode.isWhitelist()) - { - tx = 0; - } - else if (mode.isBlacklist()) - { - tx = 16; - } + if (mode.isWhitelist()) { + tx = 0; + } else if (mode.isBlacklist()) { + tx = 16; + } - gui.drawTexture(x, y + 1, tx, 64, 16, 16); - } + gui.drawTexture(x, y + 1, tx, 64, 16, 16); + } - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); + } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java old mode 100644 new mode 100755 index 82f92487a..fcbfe747e --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -6,37 +6,32 @@ import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageRedstoneModeUpdate; import refinedstorage.tile.settings.IRedstoneModeSetting; -public class SideButtonRedstoneMode extends SideButton -{ - private IRedstoneModeSetting setting; +public class SideButtonRedstoneMode extends SideButton { + private IRedstoneModeSetting setting; - public SideButtonRedstoneMode(IRedstoneModeSetting setting) - { - this.setting = setting; - } + public SideButtonRedstoneMode(IRedstoneModeSetting setting) { + this.setting = setting; + } - @Override - public String getTooltip(GuiBase gui) - { - StringBuilder builder = new StringBuilder(); + @Override + public String getTooltip(GuiBase gui) { + StringBuilder builder = new StringBuilder(); - builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); + builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); + builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); - return builder.toString(); - } + return builder.toString(); + } - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - gui.drawTexture(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); - } + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + gui.drawTexture(x, y + 1, setting.getRedstoneMode().id * 16, 0, 16, 16); + } - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); - } + @Override + public void actionPerformed() { + RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); + } } diff --git a/src/main/java/refinedstorage/inventory/InventorySimple.java b/src/main/java/refinedstorage/inventory/InventorySimple.java old mode 100644 new mode 100755 index 0b76fb949..69aae195d --- a/src/main/java/refinedstorage/inventory/InventorySimple.java +++ b/src/main/java/refinedstorage/inventory/InventorySimple.java @@ -6,162 +6,133 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.text.ITextComponent; -public class InventorySimple implements IInventory -{ - private TileEntity tile; - private ItemStack[] inventory; - private int size; - private String name; +public class InventorySimple implements IInventory { + private TileEntity tile; + private ItemStack[] inventory; + private int size; + private String name; - public InventorySimple(String name, int size) - { - this.name = name; - this.size = size; - this.inventory = new ItemStack[size]; - } + public InventorySimple(String name, int size) { + this.name = name; + this.size = size; + this.inventory = new ItemStack[size]; + } - public InventorySimple(String name, int size, TileEntity tile) - { - this(name, size); + public InventorySimple(String name, int size, TileEntity tile) { + this(name, size); - this.tile = tile; - } + this.tile = tile; + } - @Override - public int getSizeInventory() - { - return size; - } + @Override + public int getSizeInventory() { + return size; + } - @Override - public ItemStack getStackInSlot(int slotIndex) - { - return inventory[slotIndex]; - } + @Override + public ItemStack getStackInSlot(int slotIndex) { + return inventory[slotIndex]; + } - @Override - public ItemStack decrStackSize(int slot, int amount) - { - ItemStack stack = getStackInSlot(slot); + @Override + public ItemStack decrStackSize(int slot, int amount) { + ItemStack stack = getStackInSlot(slot); - if (stack != null) - { - if (stack.stackSize <= amount) - { - setInventorySlotContents(slot, null); - } - else - { - stack = stack.splitStack(amount); + if (stack != null) { + if (stack.stackSize <= amount) { + setInventorySlotContents(slot, null); + } else { + stack = stack.splitStack(amount); - if (stack.stackSize == 0) - { - setInventorySlotContents(slot, null); - } - } - } + if (stack.stackSize == 0) { + setInventorySlotContents(slot, null); + } + } + } - return stack; - } + return stack; + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - ItemStack stack = getStackInSlot(slot); + @Override + public ItemStack removeStackFromSlot(int slot) { + ItemStack stack = getStackInSlot(slot); - if (stack != null) - { - setInventorySlotContents(slot, null); - } + if (stack != null) { + setInventorySlotContents(slot, null); + } - return stack; - } + return stack; + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - if (stack != null && stack.stackSize > getInventoryStackLimit()) - { - stack.stackSize = getInventoryStackLimit(); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + if (stack != null && stack.stackSize > getInventoryStackLimit()) { + stack.stackSize = getInventoryStackLimit(); + } - inventory[slot] = stack; - } + inventory[slot] = stack; + } - @Override - public String getName() - { - return this.name; - } + @Override + public String getName() { + return this.name; + } - @Override - public boolean hasCustomName() - { - return true; - } + @Override + public boolean hasCustomName() { + return true; + } - @Override - public int getInventoryStackLimit() - { - return 64; - } + @Override + public int getInventoryStackLimit() { + return 64; + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return true; - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return true; - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return true; + } - @Override - public void markDirty() - { - if (tile != null) - { - tile.markDirty(); - } - } + @Override + public void markDirty() { + if (tile != null) { + tile.markDirty(); + } + } - @Override - public void openInventory(EntityPlayer playerIn) - { - } + @Override + public void openInventory(EntityPlayer playerIn) { + } - @Override - public void closeInventory(EntityPlayer playerIn) - { - } + @Override + public void closeInventory(EntityPlayer playerIn) { + } - @Override - public int getField(int id) - { - return 0; - } + @Override + public int getField(int id) { + return 0; + } - @Override - public void setField(int id, int value) - { - } + @Override + public void setField(int id, int value) { + } - @Override - public int getFieldCount() - { - return 0; - } + @Override + public int getFieldCount() { + return 0; + } - @Override - public void clear() - { - } + @Override + public void clear() { + } - @Override - public ITextComponent getDisplayName() - { - return null; - } + @Override + public ITextComponent getDisplayName() { + return null; + } } diff --git a/src/main/java/refinedstorage/item/ItemBase.java b/src/main/java/refinedstorage/item/ItemBase.java old mode 100644 new mode 100755 index 48f25c383..1f4beb7b5 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -4,31 +4,26 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorage; -public abstract class ItemBase extends Item -{ - private String name; +public abstract class ItemBase extends Item { + private String name; - public ItemBase(String name) - { - this.name = name; + public ItemBase(String name) { + this.name = name; - setCreativeTab(RefinedStorage.TAB); - } + setCreativeTab(RefinedStorage.TAB); + } - @Override - public String getUnlocalizedName() - { - return "item." + RefinedStorage.ID + ":" + name; - } + @Override + public String getUnlocalizedName() { + return "item." + RefinedStorage.ID + ":" + name; + } - @Override - public String getUnlocalizedName(ItemStack stack) - { - if (getHasSubtypes()) - { - return getUnlocalizedName() + "." + stack.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack stack) { + if (getHasSubtypes()) { + return getUnlocalizedName() + "." + stack.getItemDamage(); + } - return getUnlocalizedName(); - } + return getUnlocalizedName(); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockBase.java b/src/main/java/refinedstorage/item/ItemBlockBase.java old mode 100644 new mode 100755 index 338e83026..b2a21469a --- a/src/main/java/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/refinedstorage/item/ItemBlockBase.java @@ -4,16 +4,13 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemColored; import net.minecraft.item.ItemStack; -public abstract class ItemBlockBase extends ItemColored -{ - public ItemBlockBase(Block block) - { - super(block, true); - } +public abstract class ItemBlockBase extends ItemColored { + public ItemBlockBase(Block block) { + super(block, true); + } - @Override - public String getUnlocalizedName(ItemStack stack) - { - return getUnlocalizedName() + "." + stack.getItemDamage(); - } + @Override + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedName() + "." + stack.getItemDamage(); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java old mode 100644 new mode 100755 index 73d0e4843..bd5c4e62d --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -2,10 +2,8 @@ package refinedstorage.item; import net.minecraft.block.Block; -public class ItemBlockController extends ItemBlockBase -{ - public ItemBlockController(Block block) - { - super(block); - } +public class ItemBlockController extends ItemBlockBase { + public ItemBlockController(Block block) { + super(block); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockGrid.java b/src/main/java/refinedstorage/item/ItemBlockGrid.java old mode 100644 new mode 100755 index 3a13a1114..ef8aa2ede --- a/src/main/java/refinedstorage/item/ItemBlockGrid.java +++ b/src/main/java/refinedstorage/item/ItemBlockGrid.java @@ -2,10 +2,8 @@ package refinedstorage.item; import net.minecraft.block.Block; -public class ItemBlockGrid extends ItemBlockBase -{ - public ItemBlockGrid(Block block) - { - super(block); - } +public class ItemBlockGrid extends ItemBlockBase { + public ItemBlockGrid(Block block) { + super(block); + } } diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java old mode 100644 new mode 100755 index 0d4cb264a..6a4b85c8b --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -1,6 +1,5 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,49 +10,42 @@ import refinedstorage.block.EnumStorageType; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.TileStorage; -public class ItemBlockStorage extends ItemBlockBase -{ - public ItemBlockStorage(Block block) - { - super(block); - } +import java.util.List; - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) - { - EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); +public class ItemBlockStorage extends ItemBlockBase { + public ItemBlockStorage(Block block) { + super(block); + } - if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) - { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); - if (type == EnumStorageType.TYPE_CREATIVE) - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag))); - } - else - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); - } - } - } + if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) { + NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); + if (type == EnumStorageType.TYPE_CREATIVE) { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(tag))); + } else { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity())); + } + } + } - initNBT(stack); - } + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); - public static ItemStack initNBT(ItemStack stack) - { - NBTTagCompound tag = new NBTTagCompound(); + initNBT(stack); + } - tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); + public static ItemStack initNBT(ItemStack stack) { + NBTTagCompound tag = new NBTTagCompound(); - stack.setTagCompound(tag); + tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); - return stack; - } + stack.setTagCompound(tag); + + return stack; + } } diff --git a/src/main/java/refinedstorage/item/ItemCore.java b/src/main/java/refinedstorage/item/ItemCore.java old mode 100644 new mode 100755 index 376400daf..9028b7aee --- a/src/main/java/refinedstorage/item/ItemCore.java +++ b/src/main/java/refinedstorage/item/ItemCore.java @@ -1,29 +1,26 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemCore extends ItemBase -{ - public static final int TYPE_CONSTRUCTION = 0; - public static final int TYPE_DESTRUCTION = 1; +import java.util.List; - public ItemCore() - { - super("core"); +public class ItemCore extends ItemBase { + public static final int TYPE_CONSTRUCTION = 0; + public static final int TYPE_DESTRUCTION = 1; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemCore() { + super("core"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 2; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 2; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemProcessor.java b/src/main/java/refinedstorage/item/ItemProcessor.java old mode 100644 new mode 100755 index fa7c442be..b60613ff1 --- a/src/main/java/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/refinedstorage/item/ItemProcessor.java @@ -1,34 +1,31 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemProcessor extends ItemBase -{ - public static final int TYPE_PRINTED_BASIC = 0; - public static final int TYPE_PRINTED_IMPROVED = 1; - public static final int TYPE_PRINTED_ADVANCED = 2; - public static final int TYPE_BASIC = 3; - public static final int TYPE_IMPROVED = 4; - public static final int TYPE_ADVANCED = 5; - public static final int TYPE_PRINTED_SILICON = 6; +import java.util.List; - public ItemProcessor() - { - super("processor"); +public class ItemProcessor extends ItemBase { + public static final int TYPE_PRINTED_BASIC = 0; + public static final int TYPE_PRINTED_IMPROVED = 1; + public static final int TYPE_PRINTED_ADVANCED = 2; + public static final int TYPE_BASIC = 3; + public static final int TYPE_IMPROVED = 4; + public static final int TYPE_ADVANCED = 5; + public static final int TYPE_PRINTED_SILICON = 6; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemProcessor() { + super("processor"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i <= 6; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i <= 6; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java old mode 100644 new mode 100755 index 1cb33b031..c943fb950 --- a/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java +++ b/src/main/java/refinedstorage/item/ItemQuartzEnrichedIron.java @@ -1,9 +1,7 @@ package refinedstorage.item; -public class ItemQuartzEnrichedIron extends ItemBase -{ - public ItemQuartzEnrichedIron() - { - super("quartz_enriched_iron"); - } +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/refinedstorage/item/ItemSilicon.java old mode 100644 new mode 100755 index d6cd6dce3..8217d0b25 --- a/src/main/java/refinedstorage/item/ItemSilicon.java +++ b/src/main/java/refinedstorage/item/ItemSilicon.java @@ -1,9 +1,7 @@ package refinedstorage.item; -public class ItemSilicon extends ItemBase -{ - public ItemSilicon() - { - super("silicon"); - } +public class ItemSilicon extends ItemBase { + public ItemSilicon() { + super("silicon"); + } } diff --git a/src/main/java/refinedstorage/item/ItemStorageCell.java b/src/main/java/refinedstorage/item/ItemStorageCell.java old mode 100644 new mode 100755 index 78f809f17..e649f6dad --- a/src/main/java/refinedstorage/item/ItemStorageCell.java +++ b/src/main/java/refinedstorage/item/ItemStorageCell.java @@ -1,6 +1,5 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -10,50 +9,43 @@ import net.minecraft.world.World; import refinedstorage.storage.CellStorage; import refinedstorage.storage.NBTStorage; -public class ItemStorageCell extends ItemBase -{ - public static final int TYPE_1K = 0; - public static final int TYPE_4K = 1; - public static final int TYPE_16K = 2; - public static final int TYPE_64K = 3; - public static final int TYPE_CREATIVE = 4; +import java.util.List; - public ItemStorageCell() - { - super("storage_cell"); +public class ItemStorageCell extends ItemBase { + public static final int TYPE_1K = 0; + public static final int TYPE_4K = 1; + public static final int TYPE_16K = 2; + public static final int TYPE_64K = 3; + public static final int TYPE_CREATIVE = 4; - setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemStorageCell() { + super("storage_cell"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i < 5; ++i) - { - list.add(NBTStorage.initNBT(new ItemStack(item, 1, i))); - } - } + setMaxStackSize(1); + setHasSubtypes(true); + setMaxDamage(0); + } - @Override - public void addInformation(ItemStack cell, EntityPlayer player, List list, boolean b) - { - if (CellStorage.getCapacity(cell) == -1) - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); - } - else - { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); - } - } + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 5; ++i) { + list.add(NBTStorage.initNBT(new ItemStack(item, 1, i))); + } + } - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); + @Override + public void addInformation(ItemStack cell, EntityPlayer player, List list, boolean b) { + if (CellStorage.getCapacity(cell) == -1) { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); + } else { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); + } + } - NBTStorage.initNBT(stack); - } + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); + + NBTStorage.initNBT(stack); + } } diff --git a/src/main/java/refinedstorage/item/ItemStoragePart.java b/src/main/java/refinedstorage/item/ItemStoragePart.java old mode 100644 new mode 100755 index 0f282b5c9..509378f43 --- a/src/main/java/refinedstorage/item/ItemStoragePart.java +++ b/src/main/java/refinedstorage/item/ItemStoragePart.java @@ -1,31 +1,28 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemStoragePart extends ItemBase -{ - public static final int TYPE_1K = 0; - public static final int TYPE_4K = 1; - public static final int TYPE_16K = 2; - public static final int TYPE_64K = 3; +import java.util.List; - public ItemStoragePart() - { - super("storage_part"); +public class ItemStoragePart extends ItemBase { + public static final int TYPE_1K = 0; + public static final int TYPE_4K = 1; + public static final int TYPE_16K = 2; + public static final int TYPE_64K = 3; - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemStoragePart() { + super("storage_part"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - for (int i = 0; i <= 3; ++i) - { - list.add(new ItemStack(item, 1, i)); - } - } + setHasSubtypes(true); + setMaxDamage(0); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i <= 3; ++i) { + list.add(new ItemStack(item, 1, i)); + } + } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java old mode 100644 new mode 100755 index 19d25cbb4..884dcd931 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -1,6 +1,5 @@ package refinedstorage.item; -import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,121 +18,94 @@ import refinedstorage.block.EnumGridType; import refinedstorage.tile.TileGrid; import refinedstorage.tile.TileWirelessTransmitter; -public class ItemWirelessGrid extends ItemBase -{ - public static final String NBT_WIRELESS_TRANSMITTER_X = "WirelessTransmitterX"; - public static final String NBT_WIRELESS_TRANSMITTER_Y = "WirelessTransmitterY"; - public static final String NBT_WIRELESS_TRANSMITTER_Z = "WirelessTransmitterZ"; +import java.util.List; - public ItemWirelessGrid() - { - super("wireless_grid"); +public class ItemWirelessGrid extends ItemBase { + public static final String NBT_WIRELESS_TRANSMITTER_X = "WirelessTransmitterX"; + public static final String NBT_WIRELESS_TRANSMITTER_Y = "WirelessTransmitterY"; + public static final String NBT_WIRELESS_TRANSMITTER_Z = "WirelessTransmitterZ"; - setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } + public ItemWirelessGrid() { + super("wireless_grid"); - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) - { - list.add(new ItemStack(item, 1, 0)); - list.add(new ItemStack(item, 1, 1)); - } + setMaxStackSize(1); + setHasSubtypes(true); + setMaxDamage(0); + } - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) - { - if (isValid(stack)) - { - list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); - } - } + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + } - @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) - { - if (!world.isRemote) - { - if (isValid(stack)) - { - if (isInRange(stack, player)) - { - int x = getX(stack); - int y = getY(stack); - int z = getZ(stack); + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + if (isValid(stack)) { + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); + } + } - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + @Override + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if (!world.isRemote) { + if (isValid(stack)) { + if (isInRange(stack, player)) { + int x = getX(stack); + int y = getY(stack); + int z = getZ(stack); - if (tile instanceof TileWirelessTransmitter) - { - TileWirelessTransmitter wirelessTransmitter = (TileWirelessTransmitter) tile; + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); - if (wirelessTransmitter.isWorking()) - { - TileGrid grid = wirelessTransmitter.getGrid(stack.getItemDamage() == 1 ? EnumGridType.CRAFTING : EnumGridType.NORMAL); + if (tile instanceof TileWirelessTransmitter) { + TileWirelessTransmitter wirelessTransmitter = (TileWirelessTransmitter) tile; - if (grid == null) - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage()))); - } - else - { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); + if (wirelessTransmitter.isWorking()) { + TileGrid grid = wirelessTransmitter.getGrid(stack.getItemDamage() == 1 ? EnumGridType.CRAFTING : EnumGridType.NORMAL); - return new ActionResult(EnumActionResult.SUCCESS, stack); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); - } - } - else - { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage()))); - } + if (grid == null) { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage()))); + } else { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); - return new ActionResult(EnumActionResult.FAIL, stack); - } - else - { - return new ActionResult(EnumActionResult.PASS, stack); - } - } + return new ActionResult(EnumActionResult.SUCCESS, stack); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working"))); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); + } + } else { + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage()))); + } - public static int getX(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); - } + return new ActionResult(EnumActionResult.FAIL, stack); + } else { + return new ActionResult(EnumActionResult.PASS, stack); + } + } - public static int getY(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); - } + public static int getX(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); + } - public static int getZ(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Z); - } + public static int getY(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); + } - public static boolean isInRange(ItemStack stack, EntityPlayer player) - { - return (int) Math.sqrt(Math.pow(getX(stack) - player.posX, 2) + Math.pow(getY(stack) - player.posY, 2) + Math.pow(getZ(stack) - player.posZ, 2)) < 64; - } + public static int getZ(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Z); + } - public static boolean isValid(ItemStack stack) - { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_X) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Y) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Z); - } + public static boolean isInRange(ItemStack stack, EntityPlayer player) { + return (int) Math.sqrt(Math.pow(getX(stack) - player.posX, 2) + Math.pow(getY(stack) - player.posY, 2) + Math.pow(getZ(stack) - player.posZ, 2)) < 64; + } + + public static boolean isValid(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_X) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Y) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Z); + } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java old mode 100644 new mode 100755 index 89187280d..23f2308ca --- a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java @@ -1,11 +1,9 @@ package refinedstorage.item; -public class ItemWirelessGridPlate extends ItemBase -{ - public ItemWirelessGridPlate() - { - super("wireless_grid_plate"); +public class ItemWirelessGridPlate extends ItemBase { + public ItemWirelessGridPlate() { + super("wireless_grid_plate"); - setMaxStackSize(1); - } + setMaxStackSize(1); + } } diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java old mode 100644 new mode 100755 index 678d28d28..382a3cce3 --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -10,19 +10,17 @@ import refinedstorage.storage.CellStorage; import refinedstorage.tile.TileStorage; @JEIPlugin -public class PluginRefinedStorage extends BlankModPlugin -{ - @Override - public void register(IModRegistry registry) - { - // @TODO: JEI transfer handler - registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); +public class PluginRefinedStorage extends BlankModPlugin { + @Override + public void register(IModRegistry registry) { + // @TODO: JEI transfer handler + registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); - registry.addRecipeHandlers(new SoldererRecipeHandler()); + registry.addRecipeHandlers(new SoldererRecipeHandler()); - registry.addRecipes(SoldererRecipeMaker.getRecipes()); + registry.addRecipes(SoldererRecipeMaker.getRecipes()); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); - } + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java old mode 100644 new mode 100755 index 16bf847f3..216dfcefd --- a/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java @@ -11,68 +11,57 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; -public class SoldererRecipeCategory implements IRecipeCategory -{ - private IDrawable background; +public class SoldererRecipeCategory implements IRecipeCategory { + private IDrawable background; - public SoldererRecipeCategory(IGuiHelper helper) - { - background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89); - } + public SoldererRecipeCategory(IGuiHelper helper) { + background = helper.createDrawable(new ResourceLocation("refinedstorage", "textures/gui/solderer.png"), 8, 5, 162, 89); + } - @Override - public String getUid() - { - return "refinedstorage.solderer"; - } + @Override + public String getUid() { + return "refinedstorage.solderer"; + } - @Override - public String getTitle() - { - return I18n.translateToLocal("gui.refinedstorage:solderer"); - } + @Override + public String getTitle() { + return I18n.translateToLocal("gui.refinedstorage:solderer"); + } - @Override - public IDrawable getBackground() - { - return background; - } + @Override + public IDrawable getBackground() { + return background; + } - @Override - public void drawExtras(Minecraft minecraft) - { - } + @Override + public void drawExtras(Minecraft minecraft) { + } - @Override - public void drawAnimations(Minecraft minecraft) - { - } + @Override + public void drawAnimations(Minecraft minecraft) { + } - @Override - public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) - { - IGuiItemStackGroup group = recipeLayout.getItemStacks(); + @Override + public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) { + IGuiItemStackGroup group = recipeLayout.getItemStacks(); - int x = 44 - 9; - int y = 20 - 6; + int x = 44 - 9; + int y = 20 - 6; - for (int i = 0; i < 3; ++i) - { - group.init(i, true, x, y); + for (int i = 0; i < 3; ++i) { + group.init(i, true, x, y); - y += 18; - } + y += 18; + } - group.init(3, false, 134 - 9, 38 - 6); + group.init(3, false, 134 - 9, 38 - 6); - if (recipeWrapper instanceof SoldererRecipeWrapper) - { - for (int i = 0; i < 3; ++i) - { - group.set(i, (ItemStack) recipeWrapper.getInputs().get(i)); - } + if (recipeWrapper instanceof SoldererRecipeWrapper) { + for (int i = 0; i < 3; ++i) { + group.set(i, (ItemStack) recipeWrapper.getInputs().get(i)); + } - group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0)); - } - } + group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0)); + } + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java old mode 100644 new mode 100755 index 86e95b3e5..8f0c3f52c --- a/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java @@ -3,29 +3,24 @@ package refinedstorage.jei; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; -public class SoldererRecipeHandler implements IRecipeHandler -{ - @Override - public Class getRecipeClass() - { - return SoldererRecipeWrapper.class; - } +public class SoldererRecipeHandler implements IRecipeHandler { + @Override + public Class getRecipeClass() { + return SoldererRecipeWrapper.class; + } - @Override - public String getRecipeCategoryUid() - { - return "refinedstorage.solderer"; - } + @Override + public String getRecipeCategoryUid() { + return "refinedstorage.solderer"; + } - @Override - public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) - { - return recipe; - } + @Override + public IRecipeWrapper getRecipeWrapper(SoldererRecipeWrapper recipe) { + return recipe; + } - @Override - public boolean isRecipeValid(SoldererRecipeWrapper recipe) - { - return true; - } + @Override + public boolean isRecipeValid(SoldererRecipeWrapper recipe) { + return true; + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java b/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java old mode 100644 new mode 100755 index c746339e7..ae2b72694 --- a/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeMaker.java @@ -1,30 +1,28 @@ package refinedstorage.jei; -import java.util.ArrayList; -import java.util.List; import net.minecraft.item.ItemStack; import refinedstorage.tile.solderer.ISoldererRecipe; import refinedstorage.tile.solderer.SoldererRegistry; -public class SoldererRecipeMaker -{ - public static List getRecipes() - { - List recipes = new ArrayList(); +import java.util.ArrayList; +import java.util.List; - for (ISoldererRecipe recipe : SoldererRegistry.recipes) - { - List inputs = new ArrayList(); +public class SoldererRecipeMaker { + public static List getRecipes() { + List recipes = new ArrayList(); - inputs.add(recipe.getRow(0)); - inputs.add(recipe.getRow(1)); - inputs.add(recipe.getRow(2)); + for (ISoldererRecipe recipe : SoldererRegistry.recipes) { + List inputs = new ArrayList(); - ItemStack output = recipe.getResult(); + inputs.add(recipe.getRow(0)); + inputs.add(recipe.getRow(1)); + inputs.add(recipe.getRow(2)); - recipes.add(new SoldererRecipeWrapper(inputs, output)); - } + ItemStack output = recipe.getResult(); - return recipes; - } + recipes.add(new SoldererRecipeWrapper(inputs, output)); + } + + return recipes; + } } diff --git a/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java b/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java old mode 100644 new mode 100755 index 0f181c48b..3a045d881 --- a/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeWrapper.java @@ -1,79 +1,68 @@ package refinedstorage.jei; import com.google.common.base.Objects; -import java.util.Collections; -import java.util.List; import mezz.jei.plugins.vanilla.VanillaRecipeWrapper; import net.minecraft.item.ItemStack; -public class SoldererRecipeWrapper extends VanillaRecipeWrapper -{ - private int hashCode; - private List inputs; - private ItemStack output; +import java.util.Collections; +import java.util.List; - public SoldererRecipeWrapper(List inputs, ItemStack output) - { - this.inputs = inputs; - this.output = output; +public class SoldererRecipeWrapper extends VanillaRecipeWrapper { + private int hashCode; + private List inputs; + private ItemStack output; - int available = 0; + public SoldererRecipeWrapper(List inputs, ItemStack output) { + this.inputs = inputs; + this.output = output; - for (int i = 0; i < 3; ++i) - { - if (inputs.get(i) != null) - { - available = i; + int available = 0; - break; - } - } + for (int i = 0; i < 3; ++i) { + if (inputs.get(i) != null) { + available = i; - hashCode = Objects.hashCode(inputs.get(available), output); - } + break; + } + } - @Override - public List getInputs() - { - return inputs; - } + hashCode = Objects.hashCode(inputs.get(available), output); + } - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } + @Override + public List getInputs() { + return inputs; + } - @Override - public boolean equals(Object obj) - { - if (!(obj instanceof SoldererRecipeWrapper)) - { - return false; - } + @Override + public List getOutputs() { + return Collections.singletonList(output); + } - SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SoldererRecipeWrapper)) { + return false; + } - for (int i = 0; i < inputs.size(); i++) - { - if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) - { - return false; - } - } + SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; - return ItemStack.areItemStacksEqual(output, other.output); - } + for (int i = 0; i < inputs.size(); i++) { + if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) { + return false; + } + } - @Override - public int hashCode() - { - return hashCode; - } + return ItemStack.areItemStacksEqual(output, other.output); + } - @Override - public String toString() - { - return inputs + " = " + output; - } + @Override + public int hashCode() { + return hashCode; + } + + @Override + public String toString() { + return inputs + " = " + output; + } } diff --git a/src/main/java/refinedstorage/network/MessageCompareUpdate.java b/src/main/java/refinedstorage/network/MessageCompareUpdate.java old mode 100644 new mode 100755 index adbc4bf53..17ec03cc2 --- a/src/main/java/refinedstorage/network/MessageCompareUpdate.java +++ b/src/main/java/refinedstorage/network/MessageCompareUpdate.java @@ -7,51 +7,44 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.ICompareSetting; -public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int compare; +public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int compare; - public MessageCompareUpdate() - { - } + public MessageCompareUpdate() { + } - public MessageCompareUpdate(ICompareSetting setting, int compare) - { - this.x = setting.getMachinePos().getX(); - this.y = setting.getMachinePos().getY(); - this.z = setting.getMachinePos().getZ(); - this.compare = compare; - } + public MessageCompareUpdate(ICompareSetting setting, int compare) { + this.x = setting.getMachinePos().getX(); + this.y = setting.getMachinePos().getY(); + this.z = setting.getMachinePos().getZ(); + this.compare = compare; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - compare = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(compare); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(compare); + } - @Override - public void handle(MessageCompareUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageCompareUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof ICompareSetting) - { - ((ICompareSetting) tile).setCompare(message.compare); - } - } + if (tile instanceof ICompareSetting) { + ((ICompareSetting) tile).setCompare(message.compare); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java old mode 100644 new mode 100755 index c097cb0d8..621237916 --- a/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java @@ -7,51 +7,44 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileDetector; -public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int amount; +public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int amount; - public MessageDetectorAmountUpdate() - { - } + public MessageDetectorAmountUpdate() { + } - public MessageDetectorAmountUpdate(TileDetector detector, int amount) - { - this.x = detector.getPos().getX(); - this.y = detector.getPos().getY(); - this.z = detector.getPos().getZ(); - this.amount = amount; - } + public MessageDetectorAmountUpdate(TileDetector detector, int amount) { + this.x = detector.getPos().getX(); + this.y = detector.getPos().getY(); + this.z = detector.getPos().getZ(); + this.amount = amount; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - amount = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + amount = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(amount); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(amount); + } - @Override - public void handle(MessageDetectorAmountUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageDetectorAmountUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileDetector && message.amount >= 0) - { - ((TileDetector) tile).setAmount(message.amount); - } - } + if (tile instanceof TileDetector && message.amount >= 0) { + ((TileDetector) tile).setAmount(message.amount); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java old mode 100644 new mode 100755 index 5c5e2a9b9..4b2905426 --- a/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java @@ -7,60 +7,52 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileDetector; -public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageDetectorModeUpdate() - { - } + public MessageDetectorModeUpdate() { + } - public MessageDetectorModeUpdate(TileDetector detector) - { - this.x = detector.getPos().getX(); - this.y = detector.getPos().getY(); - this.z = detector.getPos().getZ(); - } + public MessageDetectorModeUpdate(TileDetector detector) { + this.x = detector.getPos().getX(); + this.y = detector.getPos().getY(); + this.z = detector.getPos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageDetectorModeUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageDetectorModeUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileDetector) - { - TileDetector detector = (TileDetector) tile; + if (tile instanceof TileDetector) { + TileDetector detector = (TileDetector) tile; - switch (detector.getMode()) - { - case TileDetector.MODE_UNDER: - detector.setMode(TileDetector.MODE_EQUAL); - break; - case TileDetector.MODE_EQUAL: - detector.setMode(TileDetector.MODE_ABOVE); - break; - case TileDetector.MODE_ABOVE: - detector.setMode(TileDetector.MODE_UNDER); - break; - } - } - } + switch (detector.getMode()) { + case TileDetector.MODE_UNDER: + detector.setMode(TileDetector.MODE_EQUAL); + break; + case TileDetector.MODE_EQUAL: + detector.setMode(TileDetector.MODE_ABOVE); + break; + case TileDetector.MODE_ABOVE: + detector.setMode(TileDetector.MODE_UNDER); + break; + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java old mode 100644 new mode 100755 index 6b13bac1c..ef3bc8cf3 --- a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java @@ -9,63 +9,52 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.block.EnumGridType; import refinedstorage.tile.TileGrid; -public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageGridCraftingClear() - { - } + public MessageGridCraftingClear() { + } - public MessageGridCraftingClear(TileGrid grid) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - } + public MessageGridCraftingClear(TileGrid grid) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageGridCraftingClear message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageGridCraftingClear message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileGrid) - { - TileGrid grid = (TileGrid) tile; + if (tile instanceof TileGrid) { + TileGrid grid = (TileGrid) tile; - if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING) - { - for (int i = 0; i < grid.getCraftingInventory().getSizeInventory(); ++i) - { - ItemStack slot = grid.getCraftingInventory().getStackInSlot(i); + if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING) { + for (int i = 0; i < grid.getCraftingInventory().getSizeInventory(); ++i) { + ItemStack slot = grid.getCraftingInventory().getStackInSlot(i); - if (slot != null) - { - if (grid.getController().push(slot)) - { - grid.getCraftingInventory().setInventorySlotContents(i, null); - } - } - } - } - } - } + if (slot != null) { + if (grid.getController().push(slot)) { + grid.getCraftingInventory().setInventorySlotContents(i, null); + } + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java old mode 100644 new mode 100755 index 78f1b133e..37fb7c0df --- a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java @@ -11,75 +11,62 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import refinedstorage.tile.TileGrid; -public class MessageGridCraftingUpdate implements IMessage, IMessageHandler -{ - private int x; - private int y; - private int z; - private ItemStack[] craftingMatrix = new ItemStack[9]; +public class MessageGridCraftingUpdate implements IMessage, IMessageHandler { + private int x; + private int y; + private int z; + private ItemStack[] craftingMatrix = new ItemStack[9]; - public MessageGridCraftingUpdate() - { - } + public MessageGridCraftingUpdate() { + } - public MessageGridCraftingUpdate(TileGrid grid) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); + public MessageGridCraftingUpdate(TileGrid grid) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); - for (int i = 0; i < 9; ++i) - { - craftingMatrix[i] = grid.getCraftingInventory().getStackInSlot(i); - } - } + for (int i = 0; i < 9; ++i) { + craftingMatrix[i] = grid.getCraftingInventory().getStackInSlot(i); + } + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); - for (int i = 0; i < 9; ++i) - { - craftingMatrix[i] = ByteBufUtils.readItemStack(buf); - } - } + for (int i = 0; i < 9; ++i) { + craftingMatrix[i] = ByteBufUtils.readItemStack(buf); + } + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); - for (ItemStack stack : craftingMatrix) - { - ByteBufUtils.writeItemStack(buf, stack); - } - } + for (ItemStack stack : craftingMatrix) { + ByteBufUtils.writeItemStack(buf, stack); + } + } - @Override - public IMessage onMessage(final MessageGridCraftingUpdate message, MessageContext context) - { - Minecraft.getMinecraft().addScheduledTask(new Runnable() - { - @Override - public void run() - { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public IMessage onMessage(final MessageGridCraftingUpdate message, MessageContext context) { + Minecraft.getMinecraft().addScheduledTask(new Runnable() { + @Override + public void run() { + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileGrid) - { - for (int i = 0; i < 9; ++i) - { - ((TileGrid) tile).getCraftingInventory().setInventorySlotContents(i, message.craftingMatrix[i]); - } - } - } - }); + if (tile instanceof TileGrid) { + for (int i = 0; i < 9; ++i) { + ((TileGrid) tile).getCraftingInventory().setInventorySlotContents(i, message.craftingMatrix[i]); + } + } + } + }); - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java old mode 100644 new mode 100755 index 1f2ac8f42..11781aec1 --- a/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java @@ -7,63 +7,54 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileGrid; -public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int sortingDirection; - private int sortingType; +public class MessageGridSortingUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int sortingDirection; + private int sortingType; - public MessageGridSortingUpdate() - { - } + public MessageGridSortingUpdate() { + } - public MessageGridSortingUpdate(TileGrid grid, int sortingDirection, int sortingType) - { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - this.sortingDirection = sortingDirection; - this.sortingType = sortingType; - } + public MessageGridSortingUpdate(TileGrid grid, int sortingDirection, int sortingType) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + this.sortingDirection = sortingDirection; + this.sortingType = sortingType; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - sortingDirection = buf.readInt(); - sortingType = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + sortingDirection = buf.readInt(); + sortingType = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(sortingDirection); - buf.writeInt(sortingType); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(sortingDirection); + buf.writeInt(sortingType); + } - @Override - public void handle(MessageGridSortingUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageGridSortingUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileGrid) - { - if (message.sortingDirection == TileGrid.SORTING_DIRECTION_ASCENDING || message.sortingDirection == TileGrid.SORTING_DIRECTION_DESCENDING) - { - ((TileGrid) tile).setSortingDirection(message.sortingDirection); - } + if (tile instanceof TileGrid) { + if (message.sortingDirection == TileGrid.SORTING_DIRECTION_ASCENDING || message.sortingDirection == TileGrid.SORTING_DIRECTION_DESCENDING) { + ((TileGrid) tile).setSortingDirection(message.sortingDirection); + } - if (message.sortingType == TileGrid.SORTING_TYPE_QUANTITY || message.sortingType == TileGrid.SORTING_TYPE_NAME) - { - ((TileGrid) tile).setSortingType(message.sortingType); - } - } - } + if (message.sortingType == TileGrid.SORTING_TYPE_QUANTITY || message.sortingType == TileGrid.SORTING_TYPE_NAME) { + ((TileGrid) tile).setSortingType(message.sortingType); + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java old mode 100644 new mode 100755 index 2c6c1bc44..d26898d4b --- a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java +++ b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java @@ -5,24 +5,20 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -public abstract class MessageHandlerPlayerToServer implements IMessageHandler -{ - @Override - public IMessage onMessage(final T message, MessageContext context) - { - final EntityPlayerMP player = context.getServerHandler().playerEntity; +public abstract class MessageHandlerPlayerToServer implements IMessageHandler { + @Override + public IMessage onMessage(final T message, MessageContext context) { + final EntityPlayerMP player = context.getServerHandler().playerEntity; - player.getServerForPlayer().addScheduledTask(new Runnable() - { - @Override - public void run() - { - handle(message, player); - } - }); + player.getServerForPlayer().addScheduledTask(new Runnable() { + @Override + public void run() { + handle(message, player); + } + }); - return null; - } + return null; + } - public abstract void handle(T message, EntityPlayerMP player); + public abstract void handle(T message, EntityPlayerMP player); } diff --git a/src/main/java/refinedstorage/network/MessageModeToggle.java b/src/main/java/refinedstorage/network/MessageModeToggle.java old mode 100644 new mode 100755 index 0085479cf..7c986c15e --- a/src/main/java/refinedstorage/network/MessageModeToggle.java +++ b/src/main/java/refinedstorage/network/MessageModeToggle.java @@ -7,56 +7,46 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.IModeSetting; -public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageModeToggle() - { - } + public MessageModeToggle() { + } - public MessageModeToggle(IModeSetting mode) - { - this.x = mode.getMachinePos().getX(); - this.y = mode.getMachinePos().getY(); - this.z = mode.getMachinePos().getZ(); - } + public MessageModeToggle(IModeSetting mode) { + this.x = mode.getMachinePos().getX(); + this.y = mode.getMachinePos().getY(); + this.z = mode.getMachinePos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageModeToggle message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageModeToggle message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof IModeSetting) - { - IModeSetting mode = (IModeSetting) tile; + if (tile instanceof IModeSetting) { + IModeSetting mode = (IModeSetting) tile; - if (mode.isWhitelist()) - { - mode.setToBlacklist(); - } - else if (mode.isBlacklist()) - { - mode.setToWhitelist(); - } - } - } + if (mode.isWhitelist()) { + mode.setToBlacklist(); + } else if (mode.isBlacklist()) { + mode.setToWhitelist(); + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java old mode 100644 new mode 100755 index 16a648e51..89ab018cf --- a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java +++ b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java @@ -9,59 +9,48 @@ import refinedstorage.tile.TileDrive; import refinedstorage.tile.TileExternalStorage; import refinedstorage.tile.TileStorage; -public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int priority; +public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int priority; - public MessagePriorityUpdate() - { - } + public MessagePriorityUpdate() { + } - public MessagePriorityUpdate(BlockPos pos, int priority) - { - this.x = pos.getX(); - this.y = pos.getY(); - this.z = pos.getZ(); - this.priority = priority; - } + public MessagePriorityUpdate(BlockPos pos, int priority) { + this.x = pos.getX(); + this.y = pos.getY(); + this.z = pos.getZ(); + this.priority = priority; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - priority = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + priority = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(priority); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(priority); + } - @Override - public void handle(MessagePriorityUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessagePriorityUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileStorage) - { - ((TileStorage) tile).setPriority(message.priority); - } - else if (tile instanceof TileExternalStorage) - { - ((TileExternalStorage) tile).setPriority(message.priority); - } - else if (tile instanceof TileDrive) - { - ((TileDrive) tile).setPriority(message.priority); - } - } + if (tile instanceof TileStorage) { + ((TileStorage) tile).setPriority(message.priority); + } else if (tile instanceof TileExternalStorage) { + ((TileExternalStorage) tile).setPriority(message.priority); + } else if (tile instanceof TileDrive) { + ((TileDrive) tile).setPriority(message.priority); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java old mode 100644 new mode 100755 index 9e12224b4..e664977cd --- a/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java @@ -7,49 +7,42 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.settings.IRedstoneModeSetting; -public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; +public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; - public MessageRedstoneModeUpdate() - { - } + public MessageRedstoneModeUpdate() { + } - public MessageRedstoneModeUpdate(IRedstoneModeSetting setting) - { - this.x = setting.getMachinePos().getX(); - this.y = setting.getMachinePos().getY(); - this.z = setting.getMachinePos().getZ(); - } + public MessageRedstoneModeUpdate(IRedstoneModeSetting setting) { + this.x = setting.getMachinePos().getX(); + this.y = setting.getMachinePos().getY(); + this.z = setting.getMachinePos().getZ(); + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + } - @Override - public void handle(MessageRedstoneModeUpdate message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageRedstoneModeUpdate message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof IRedstoneModeSetting) - { - IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; + if (tile instanceof IRedstoneModeSetting) { + IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; - setting.setRedstoneMode(setting.getRedstoneMode().next()); - } - } + setting.setRedstoneMode(setting.getRedstoneMode().next()); + } + } } diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java old mode 100644 new mode 100755 index 7dcff78b0..0896bd482 --- a/src/main/java/refinedstorage/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -9,106 +9,87 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.storage.StorageItem; import refinedstorage.tile.TileController; -public class MessageStoragePull extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int id; - private boolean half; - private boolean one; - private boolean shift; +public class MessageStoragePull extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int id; + private boolean half; + private boolean one; + private boolean shift; - public MessageStoragePull() - { - } + public MessageStoragePull() { + } - public MessageStoragePull(int x, int y, int z, int id, boolean half, boolean one, boolean shift) - { - this.x = x; - this.y = y; - this.z = z; - this.id = id; - this.half = half; - this.one = one; - this.shift = shift; - } + public MessageStoragePull(int x, int y, int z, int id, boolean half, boolean one, boolean shift) { + this.x = x; + this.y = y; + this.z = z; + this.id = id; + this.half = half; + this.one = one; + this.shift = shift; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - id = buf.readInt(); - half = buf.readBoolean(); - one = buf.readBoolean(); - shift = buf.readBoolean(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + id = buf.readInt(); + half = buf.readBoolean(); + one = buf.readBoolean(); + shift = buf.readBoolean(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(id); - buf.writeBoolean(half); - buf.writeBoolean(one); - buf.writeBoolean(shift); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(id); + buf.writeBoolean(half); + buf.writeBoolean(one); + buf.writeBoolean(shift); + } - @Override - public void handle(MessageStoragePull message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageStoragePull message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileController) - { - TileController controller = (TileController) tile; + if (tile instanceof TileController) { + TileController controller = (TileController) tile; - if (message.id < controller.getItems().size()) - { - StorageItem item = controller.getItems().get(message.id); + if (message.id < controller.getItems().size()) { + StorageItem item = controller.getItems().get(message.id); - int quantity = 64; + int quantity = 64; - if (message.half && item.getQuantity() > 1) - { - quantity = item.getQuantity() / 2; + if (message.half && item.getQuantity() > 1) { + quantity = item.getQuantity() / 2; - if (quantity > 64) - { - quantity = 64; - } - } - else if (message.one) - { - quantity = 1; - } - else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack())) - { - quantity = item.getType().getItemStackLimit(item.toItemStack()); - } + if (quantity > 64) { + quantity = 64; + } + } else if (message.one) { + quantity = 1; + } else if (message.shift && quantity > item.getType().getItemStackLimit(item.toItemStack())) { + quantity = item.getType().getItemStackLimit(item.toItemStack()); + } - ItemStack took = controller.take(item.copy(quantity).toItemStack()); + ItemStack took = controller.take(item.copy(quantity).toItemStack()); - if (took != null) - { - if (message.shift) - { - if (!player.inventory.addItemStackToInventory(took.copy())) - { - controller.push(took); - } - } - else - { - player.inventory.setItemStack(took); - player.updateHeldItem(); - } - } - } - } - } + if (took != null) { + if (message.shift) { + if (!player.inventory.addItemStackToInventory(took.copy())) { + controller.push(took); + } + } else { + player.inventory.setItemStack(took); + player.updateHeldItem(); + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageStoragePush.java b/src/main/java/refinedstorage/network/MessageStoragePush.java old mode 100644 new mode 100755 index 915d512d2..7cddb9a0b --- a/src/main/java/refinedstorage/network/MessageStoragePush.java +++ b/src/main/java/refinedstorage/network/MessageStoragePush.java @@ -8,102 +8,82 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.TileController; -public class MessageStoragePush extends MessageHandlerPlayerToServer implements IMessage -{ - private int x; - private int y; - private int z; - private int slot; - private boolean one; +public class MessageStoragePush extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int slot; + private boolean one; - public MessageStoragePush() - { - } + public MessageStoragePush() { + } - public MessageStoragePush(int x, int y, int z, int slot, boolean one) - { - this.x = x; - this.y = y; - this.z = z; - this.slot = slot; - this.one = one; - } + public MessageStoragePush(int x, int y, int z, int slot, boolean one) { + this.x = x; + this.y = y; + this.z = z; + this.slot = slot; + this.one = one; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - slot = buf.readInt(); - one = buf.readBoolean(); - } + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + slot = buf.readInt(); + one = buf.readBoolean(); + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(slot); - buf.writeBoolean(one); - } + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(slot); + buf.writeBoolean(one); + } - @Override - public void handle(MessageStoragePush message, EntityPlayerMP player) - { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + @Override + public void handle(MessageStoragePush message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); - if (tile instanceof TileController) - { - TileController controller = (TileController) tile; + if (tile instanceof TileController) { + TileController controller = (TileController) tile; - ItemStack stack; + ItemStack stack; - if (message.slot == -1) - { - stack = player.inventory.getItemStack().copy(); + if (message.slot == -1) { + stack = player.inventory.getItemStack().copy(); - if (message.one) - { - stack.stackSize = 1; - } - } - else - { - stack = player.inventory.getStackInSlot(message.slot); - } + if (message.one) { + stack.stackSize = 1; + } + } else { + stack = player.inventory.getStackInSlot(message.slot); + } - if (stack != null) - { - boolean success = controller.push(stack); + if (stack != null) { + boolean success = controller.push(stack); - if (success) - { - if (message.slot == -1) - { - if (message.one) - { - player.inventory.getItemStack().stackSize--; + if (success) { + if (message.slot == -1) { + if (message.one) { + player.inventory.getItemStack().stackSize--; - if (player.inventory.getItemStack().stackSize == 0) - { - player.inventory.setItemStack(null); - } - } - else - { - player.inventory.setItemStack(null); - } + if (player.inventory.getItemStack().stackSize == 0) { + player.inventory.setItemStack(null); + } + } else { + player.inventory.setItemStack(null); + } - player.updateHeldItem(); - } - else - { - player.inventory.setInventorySlotContents(message.slot, null); - } - } - } - } - } + player.updateHeldItem(); + } else { + player.inventory.setInventorySlotContents(message.slot, null); + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/network/MessageTileUpdate.java b/src/main/java/refinedstorage/network/MessageTileUpdate.java old mode 100644 new mode 100755 index 10986a3d1..6c9dbfa5a --- a/src/main/java/refinedstorage/network/MessageTileUpdate.java +++ b/src/main/java/refinedstorage/network/MessageTileUpdate.java @@ -9,56 +9,47 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import refinedstorage.tile.INetworkTile; -public class MessageTileUpdate implements IMessage, IMessageHandler -{ - private TileEntity tile; - private int x; - private int y; - private int z; +public class MessageTileUpdate implements IMessage, IMessageHandler { + private TileEntity tile; + private int x; + private int y; + private int z; - public MessageTileUpdate() - { - } + public MessageTileUpdate() { + } - public MessageTileUpdate(TileEntity tile) - { - this.tile = tile; - } + public MessageTileUpdate(TileEntity tile) { + this.tile = tile; + } - @Override - public void fromBytes(ByteBuf buf) - { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); - if (Minecraft.getMinecraft().theWorld != null) - { - tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(x, y, z)); + if (Minecraft.getMinecraft().theWorld != null) { + tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(x, y, z)); - if (tile instanceof INetworkTile) - { - ((INetworkTile) tile).fromBytes(buf); - } - } - } + if (tile instanceof INetworkTile) { + ((INetworkTile) tile).fromBytes(buf); + } + } + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(tile.getPos().getX()); - buf.writeInt(tile.getPos().getY()); - buf.writeInt(tile.getPos().getZ()); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(tile.getPos().getX()); + buf.writeInt(tile.getPos().getY()); + buf.writeInt(tile.getPos().getZ()); - if (tile instanceof INetworkTile) - { - ((INetworkTile) tile).toBytes(buf); - } - } + if (tile instanceof INetworkTile) { + ((INetworkTile) tile).toBytes(buf); + } + } - @Override - public IMessage onMessage(MessageTileUpdate message, MessageContext ctx) - { - return null; - } + @Override + public IMessage onMessage(MessageTileUpdate message, MessageContext ctx) { + return null; + } } diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java old mode 100644 new mode 100755 index 39eb1f533..4835bd695 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -11,126 +11,121 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.block.*; +import refinedstorage.block.EnumControllerType; +import refinedstorage.block.EnumGridType; +import refinedstorage.block.EnumStorageType; import refinedstorage.item.*; -public class ClientProxy extends CommonProxy -{ - @Override - public void preInit(FMLPreInitializationEvent e) - { - super.preInit(e); +public class ClientProxy extends CommonProxy { + @Override + public void preInit(FMLPreInitializationEvent e) { + super.preInit(e); - // Item Variants - ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL, - new ResourceLocation("refinedstorage:1k_storage_cell"), - new ResourceLocation("refinedstorage:4k_storage_cell"), - new ResourceLocation("refinedstorage:16k_storage_cell"), - new ResourceLocation("refinedstorage:64k_storage_cell"), - new ResourceLocation("refinedstorage:creative_storage_cell") - ); + // Item Variants + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL, + new ResourceLocation("refinedstorage:1k_storage_cell"), + new ResourceLocation("refinedstorage:4k_storage_cell"), + new ResourceLocation("refinedstorage:16k_storage_cell"), + new ResourceLocation("refinedstorage:64k_storage_cell"), + new ResourceLocation("refinedstorage:creative_storage_cell") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, - new ResourceLocation("refinedstorage:1k_storage_part"), - new ResourceLocation("refinedstorage:4k_storage_part"), - new ResourceLocation("refinedstorage:16k_storage_part"), - new ResourceLocation("refinedstorage:64k_storage_part") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, + new ResourceLocation("refinedstorage:1k_storage_part"), + new ResourceLocation("refinedstorage:4k_storage_part"), + new ResourceLocation("refinedstorage:16k_storage_part"), + new ResourceLocation("refinedstorage:64k_storage_part") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, - new ResourceLocation("refinedstorage:basic_printed_processor"), - new ResourceLocation("refinedstorage:improved_printed_processor"), - new ResourceLocation("refinedstorage:advanced_printed_processor"), - new ResourceLocation("refinedstorage:basic_processor"), - new ResourceLocation("refinedstorage:improved_processor"), - new ResourceLocation("refinedstorage:advanced_processor"), - new ResourceLocation("refinedstorage:printed_silicon") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, + new ResourceLocation("refinedstorage:basic_printed_processor"), + new ResourceLocation("refinedstorage:improved_printed_processor"), + new ResourceLocation("refinedstorage:advanced_printed_processor"), + new ResourceLocation("refinedstorage:basic_processor"), + new ResourceLocation("refinedstorage:improved_processor"), + new ResourceLocation("refinedstorage:advanced_processor"), + new ResourceLocation("refinedstorage:printed_silicon") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.CORE, - new ResourceLocation("refinedstorage:construction_core"), - new ResourceLocation("refinedstorage:destruction_core") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.CORE, + new ResourceLocation("refinedstorage:construction_core"), + new ResourceLocation("refinedstorage:destruction_core") + ); - ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID, - new ResourceLocation("refinedstorage:wireless_grid_connected"), - new ResourceLocation("refinedstorage:wireless_grid_disconnected") - ); + ModelBakery.registerItemVariants(RefinedStorageItems.WIRELESS_GRID, + new ResourceLocation("refinedstorage:wireless_grid_connected"), + new ResourceLocation("refinedstorage:wireless_grid_disconnected") + ); - // Items - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory")); + // Items + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_BASIC, new ModelResourceLocation("refinedstorage:basic_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_IMPROVED, new ModelResourceLocation("refinedstorage:improved_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_processor", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_SILICON, new ModelResourceLocation("refinedstorage:printed_silicon", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory")); - ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - if (ItemWirelessGrid.isValid(stack)) - { - return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory"); - } - else - { - return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory"); - } - } - }); + ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + if (ItemWirelessGrid.isValid(stack)) { + return new ModelResourceLocation("refinedstorage:wireless_grid_connected", "inventory"); + } else { + return new ModelResourceLocation("refinedstorage:wireless_grid_disconnected", "inventory"); + } + } + }); - // Blocks - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DRIVE), 0, new ModelResourceLocation("refinedstorage:drive", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); + // Blocks + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DRIVE), 0, new ModelResourceLocation("refinedstorage:drive", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONTROLLER), EnumControllerType.CREATIVE.getId(), new ModelResourceLocation("refinedstorage:controller", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); - ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) - .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) - .ignore(RefinedStorageBlocks.STORAGE.CONNECTED) - .build() - ); + ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) + .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) + .ignore(RefinedStorageBlocks.STORAGE.CONNECTED) + .build() + ); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); - } + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); + } } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java old mode 100644 new mode 100755 index 475d88ad1..98a1ebd74 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -12,7 +12,9 @@ import net.minecraftforge.fml.relauncher.Side; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.block.*; +import refinedstorage.block.EnumControllerType; +import refinedstorage.block.EnumGridType; +import refinedstorage.block.EnumStorageType; import refinedstorage.gui.GuiHandler; import refinedstorage.item.*; import refinedstorage.network.*; @@ -20,350 +22,346 @@ import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; import refinedstorage.tile.solderer.*; -public class CommonProxy -{ - public void preInit(FMLPreInitializationEvent e) - { - RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); +public class CommonProxy { + public void preInit(FMLPreInitializationEvent e) { + RefinedStorage.NETWORK.registerMessage(MessageTileUpdate.class, MessageTileUpdate.class, 0, Side.CLIENT); + RefinedStorage.NETWORK.registerMessage(MessageRedstoneModeUpdate.class, MessageRedstoneModeUpdate.class, 1, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePush.class, MessageStoragePush.class, 2, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageStoragePull.class, MessageStoragePull.class, 3, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageCompareUpdate.class, MessageCompareUpdate.class, 4, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); - NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); - GameRegistry.registerTileEntity(TileController.class, "controller"); - GameRegistry.registerTileEntity(TileCable.class, "cable"); - GameRegistry.registerTileEntity(TileGrid.class, "grid"); - GameRegistry.registerTileEntity(TileDrive.class, "drive"); - GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); - GameRegistry.registerTileEntity(TileImporter.class, "importer"); - GameRegistry.registerTileEntity(TileExporter.class, "exporter"); - GameRegistry.registerTileEntity(TileDetector.class, "detector"); - GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); - GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); - GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); - GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); - GameRegistry.registerTileEntity(TileStorage.class, "storage"); - GameRegistry.registerTileEntity(TileRelay.class, "relay"); - GameRegistry.registerTileEntity(TileInterface.class, "interface"); + GameRegistry.registerTileEntity(TileController.class, "controller"); + GameRegistry.registerTileEntity(TileCable.class, "cable"); + GameRegistry.registerTileEntity(TileGrid.class, "grid"); + GameRegistry.registerTileEntity(TileDrive.class, "drive"); + GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); + GameRegistry.registerTileEntity(TileImporter.class, "importer"); + GameRegistry.registerTileEntity(TileExporter.class, "exporter"); + GameRegistry.registerTileEntity(TileDetector.class, "detector"); + GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); + GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); + GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); + GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); + GameRegistry.registerTileEntity(TileStorage.class, "storage"); + GameRegistry.registerTileEntity(TileRelay.class, "relay"); + GameRegistry.registerTileEntity(TileInterface.class, "interface"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller"); - GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable"); - GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid"); - GameRegistry.registerBlock(RefinedStorageBlocks.DRIVE, "drive"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector"); - GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing"); - GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer"); - GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, "relay"); - GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, "interface"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller"); + GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable"); + GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid"); + GameRegistry.registerBlock(RefinedStorageBlocks.DRIVE, "drive"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector"); + GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing"); + GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer"); + GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, "relay"); + GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, "interface"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); - GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); - GameRegistry.registerItem(RefinedStorageItems.CORE, "core"); - GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon"); - GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); + GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); + GameRegistry.registerItem(RefinedStorageItems.CORE, "core"); + GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon"); + GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part"); - // Processors - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); - SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); + // Processors + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_ADVANCED)); + SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_SILICON)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); - SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_BASIC)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_IMPROVED)); + SoldererRegistry.addRecipe(new SoldererRecipeProcessor(ItemProcessor.TYPE_ADVANCED)); - // Silicon - GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f); + // Silicon + GameRegistry.addSmelting(Items.quartz, new ItemStack(RefinedStorageItems.SILICON), 0.5f); - // Quartz Enriched Iron - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4), - "II", - "IQ", - 'I', new ItemStack(Items.iron_ingot), - 'Q', new ItemStack(Items.quartz) - ); + // Quartz Enriched Iron + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON, 4), + "II", + "IQ", + 'I', new ItemStack(Items.iron_ingot), + 'Q', new ItemStack(Items.quartz) + ); - // Machine Casing - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - "EEE", - "E E", - "EEE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Machine Casing + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + "EEE", + "E E", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Construction Core - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.glowstone_dust) - ); + // Construction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.glowstone_dust) + ); - // Destruction Core - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(Items.quartz) - ); + // Destruction Core + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(Items.quartz) + ); - // Relay - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.RELAY), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageBlocks.CABLE) - ); + // Relay + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.RELAY), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageBlocks.CABLE) + ); - // Controller - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), - "EDE", - "SRS", - "ESE", - 'D', new ItemStack(Items.diamond), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'S', new ItemStack(RefinedStorageItems.SILICON) - ); + // Controller + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, EnumControllerType.NORMAL.getId()), + "EDE", + "SRS", + "ESE", + 'D', new ItemStack(Items.diamond), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'S', new ItemStack(RefinedStorageItems.SILICON) + ); - // Solderer - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER), - "ESE", - "E E", - "ESE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'S', new ItemStack(Blocks.sticky_piston) - ); + // Solderer + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.SOLDERER), + "ESE", + "E E", + "ESE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'S', new ItemStack(Blocks.sticky_piston) + ); - // Drive - SoldererRegistry.addRecipe(new SoldererRecipeDrive()); + // Drive + SoldererRegistry.addRecipe(new SoldererRecipeDrive()); - // Cable - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6), - "EEE", - "GRG", - "EEE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone) - ); + // Cable + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6), + "EEE", + "GRG", + "EEE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone) + ); - // Grid - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()), - "ECE", - "PMP", - "EDE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) - ); + // Grid + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()), + "ECE", + "PMP", + "EDE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) + ); - // Crafting Grid - SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); + // Crafting Grid + SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); - // Wireless Transmitter - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER), - "EPE", - "EME", - "EAE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'P', new ItemStack(Items.ender_pearl), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) - ); + // Wireless Transmitter + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER), + "EPE", + "EME", + "EAE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'P', new ItemStack(Items.ender_pearl), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) + ); - // Wireless Grid Plate - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE), - " P ", - "ERE", - "EEE", - 'P', new ItemStack(Items.ender_pearl), - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Wireless Grid Plate + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE), + " P ", + "ERE", + "EEE", + 'P', new ItemStack(Items.ender_pearl), + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Wireless Grid - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); + // Wireless Grid + SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); + SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); - // External Storage - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), - "CED", - "HMH", - "EPE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'H', new ItemStack(Blocks.chest), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // External Storage + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), + "CED", + "HMH", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'H', new ItemStack(Blocks.chest), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Importer - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); + // Importer + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); - // Exporter - GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) - ); + // Exporter + GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), + new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC) + ); - // Destructor - GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR), - "EDE", - "RMR", - "EIE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Destructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.DESTRUCTOR), + "EDE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Constructor - GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR), - "ECE", - "RMR", - "EIE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), - 'R', new ItemStack(Items.redstone), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Constructor + GameRegistry.addShapedRecipe(new ItemStack(RefinedStorageBlocks.CONSTRUCTOR), + "ECE", + "RMR", + "EIE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), + 'R', new ItemStack(Items.redstone), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'I', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Detector - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR), - "ECE", - "RMR", - "EPE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'R', new ItemStack(Items.redstone), - 'C', new ItemStack(Items.comparator), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) - ); + // Detector + GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.DETECTOR), + "ECE", + "RMR", + "EPE", + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'R', new ItemStack(Items.redstone), + 'C', new ItemStack(Items.comparator), + 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) + ); - // Storage Cell Parts - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.SILICON), - 'S', new ItemStack(Blocks.glass) - ); + // Storage Cell Parts + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.SILICON), + 'S', new ItemStack(Blocks.glass) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K) + ); - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - "EPE", - "SRS", - "ESE", - 'R', new ItemStack(Items.redstone), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) - ); + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + "EPE", + "SRS", + "ESE", + 'R', new ItemStack(Items.redstone), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), + 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), + 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) + ); - // Storage Cells - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + // Storage Cells + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), - "GRG", - "RPR", - "EEE", - 'G', new ItemStack(Blocks.glass), - 'R', new ItemStack(Items.redstone), - 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) - ); + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), + "GRG", + "RPR", + "EEE", + 'G', new ItemStack(Blocks.glass), + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) + ); - // Storage Blocks - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); - SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); + // Storage Blocks + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K)); + SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K)); - // Interface - SoldererRegistry.addRecipe(new SoldererRecipeInterface()); - } + // Interface + SoldererRegistry.addRecipe(new SoldererRecipeInterface()); + } - public void init(FMLInitializationEvent e) - { - } + public void init(FMLInitializationEvent e) { + } - public void postInit(FMLPostInitializationEvent e) - { - } + public void postInit(FMLPostInitializationEvent e) { + } } diff --git a/src/main/java/refinedstorage/proxy/ServerProxy.java b/src/main/java/refinedstorage/proxy/ServerProxy.java old mode 100644 new mode 100755 index f1494c722..ba894b981 --- a/src/main/java/refinedstorage/proxy/ServerProxy.java +++ b/src/main/java/refinedstorage/proxy/ServerProxy.java @@ -1,5 +1,4 @@ package refinedstorage.proxy; -public class ServerProxy extends CommonProxy -{ +public class ServerProxy extends CommonProxy { } diff --git a/src/main/java/refinedstorage/storage/CellStorage.java b/src/main/java/refinedstorage/storage/CellStorage.java old mode 100644 new mode 100755 index 6d8e2d67e..90f8ae80a --- a/src/main/java/refinedstorage/storage/CellStorage.java +++ b/src/main/java/refinedstorage/storage/CellStorage.java @@ -5,44 +5,38 @@ import refinedstorage.item.ItemStorageCell; import refinedstorage.tile.TileDrive; import refinedstorage.tile.settings.ModeSettingUtils; -public class CellStorage extends NBTStorage -{ - private TileDrive drive; +public class CellStorage extends NBTStorage { + private TileDrive drive; - public CellStorage(ItemStack cell, TileDrive drive) - { - super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); + public CellStorage(ItemStack cell, TileDrive drive) { + super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); - this.drive = drive; - } + this.drive = drive; + } - @Override - public boolean canPush(ItemStack stack) - { - if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) - { - return super.canPush(stack); - } + @Override + public boolean canPush(ItemStack stack) { + if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) { + return super.canPush(stack); + } - return false; - } + return false; + } - public static int getCapacity(ItemStack cell) - { - switch (cell.getItemDamage()) - { - case ItemStorageCell.TYPE_1K: - return 1000; - case ItemStorageCell.TYPE_4K: - return 4000; - case ItemStorageCell.TYPE_16K: - return 16000; - case ItemStorageCell.TYPE_64K: - return 64000; - case ItemStorageCell.TYPE_CREATIVE: - return -1; - } + public static int getCapacity(ItemStack cell) { + switch (cell.getItemDamage()) { + case ItemStorageCell.TYPE_1K: + return 1000; + case ItemStorageCell.TYPE_4K: + return 4000; + case ItemStorageCell.TYPE_16K: + return 16000; + case ItemStorageCell.TYPE_64K: + return 64000; + case ItemStorageCell.TYPE_CREATIVE: + return -1; + } - return 0; - } + return 0; + } } diff --git a/src/main/java/refinedstorage/storage/IStorage.java b/src/main/java/refinedstorage/storage/IStorage.java old mode 100644 new mode 100755 index 43459e1f0..ef06413d4 --- a/src/main/java/refinedstorage/storage/IStorage.java +++ b/src/main/java/refinedstorage/storage/IStorage.java @@ -1,17 +1,17 @@ package refinedstorage.storage; -import java.util.List; import net.minecraft.item.ItemStack; -public interface IStorage -{ - public void addItems(List items); +import java.util.List; - public void push(ItemStack stack); +public interface IStorage { + public void addItems(List items); - public ItemStack take(ItemStack stack, int flags); + public void push(ItemStack stack); - public boolean canPush(ItemStack stack); + public ItemStack take(ItemStack stack, int flags); - public int getPriority(); + public boolean canPush(ItemStack stack); + + public int getPriority(); } diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java old mode 100644 new mode 100755 index dcc4ab86e..adac2c220 --- a/src/main/java/refinedstorage/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -5,23 +5,22 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; -public interface IStorageGui -{ - public String getName(); +public interface IStorageGui { + public String getName(); - public int getPriority(); + public int getPriority(); - public void onPriorityChanged(int priority); + public void onPriorityChanged(int priority); - public IInventory getInventory(); + public IInventory getInventory(); - public IRedstoneModeSetting getRedstoneModeSetting(); + public IRedstoneModeSetting getRedstoneModeSetting(); - public ICompareSetting getCompareSetting(); + public ICompareSetting getCompareSetting(); - public IModeSetting getModeSetting(); + public IModeSetting getModeSetting(); - public int getStored(); + public int getStored(); - public int getCapacity(); + public int getCapacity(); } diff --git a/src/main/java/refinedstorage/storage/IStorageProvider.java b/src/main/java/refinedstorage/storage/IStorageProvider.java old mode 100644 new mode 100755 index 678d7e823..8debb2a15 --- a/src/main/java/refinedstorage/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/storage/IStorageProvider.java @@ -2,7 +2,6 @@ package refinedstorage.storage; import java.util.List; -public interface IStorageProvider -{ - public void addStorages(List storages); +public interface IStorageProvider { + public void addStorages(List storages); } diff --git a/src/main/java/refinedstorage/storage/NBTStorage.java b/src/main/java/refinedstorage/storage/NBTStorage.java old mode 100644 new mode 100755 index e3ad6eb28..4ce2260fb --- a/src/main/java/refinedstorage/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/storage/NBTStorage.java @@ -1,159 +1,140 @@ package refinedstorage.storage; -import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class NBTStorage implements IStorage -{ - public static final String NBT_ITEMS = "Items"; - public static final String NBT_STORED = "Stored"; +import java.util.List; - public static final String NBT_ITEM_TYPE = "Type"; - public static final String NBT_ITEM_QUANTITY = "Quantity"; - public static final String NBT_ITEM_DAMAGE = "Damage"; - public static final String NBT_ITEM_NBT = "NBT"; +public class NBTStorage implements IStorage { + public static final String NBT_ITEMS = "Items"; + public static final String NBT_STORED = "Stored"; - private NBTTagCompound nbtTag; - private int capacity; - private int priority; + public static final String NBT_ITEM_TYPE = "Type"; + public static final String NBT_ITEM_QUANTITY = "Quantity"; + public static final String NBT_ITEM_DAMAGE = "Damage"; + public static final String NBT_ITEM_NBT = "NBT"; - public NBTStorage(NBTTagCompound tag, int capacity, int priority) - { - this.nbtTag = tag; - this.capacity = capacity; - this.priority = priority; - } + private NBTTagCompound nbtTag; + private int capacity; + private int priority; - @Override - public void addItems(List items) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + public NBTStorage(NBTTagCompound tag, int capacity, int priority) { + this.nbtTag = tag; + this.capacity = capacity; + this.priority = priority; + } - for (int i = 0; i < list.tagCount(); ++i) - { - items.add(createItemFromNBT(list.getCompoundTagAt(i))); - } - } + @Override + public void addItems(List items) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - @Override - public void push(ItemStack stack) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + for (int i = 0; i < list.tagCount(); ++i) { + items.add(createItemFromNBT(list.getCompoundTagAt(i))); + } + } - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); + @Override + public void push(ItemStack stack) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); - StorageItem item = createItemFromNBT(tag); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - if (item.compareNoQuantity(stack)) - { - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); + StorageItem item = createItemFromNBT(tag); - return; - } - } + if (item.compareNoQuantity(stack)) { + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); - NBTTagCompound tag = new NBTTagCompound(); + return; + } + } - tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); - tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); - tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); + NBTTagCompound tag = new NBTTagCompound(); - if (stack.hasTagCompound()) - { - tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); - } + tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); + tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); + tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); - list.appendTag(tag); - } + if (stack.hasTagCompound()) { + tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); + } - @Override - public ItemStack take(ItemStack stack, int flags) - { - int quantity = stack.stackSize; + list.appendTag(tag); + } - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + @Override + public ItemStack take(ItemStack stack, int flags) { + int quantity = stack.stackSize; - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - StorageItem item = createItemFromNBT(tag); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - if (item.compare(stack, flags)) - { - if (quantity > item.getQuantity()) - { - quantity = item.getQuantity(); - } + StorageItem item = createItemFromNBT(tag); - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); + if (item.compare(stack, flags)) { + if (quantity > item.getQuantity()) { + quantity = item.getQuantity(); + } - if (item.getQuantity() - quantity == 0) - { - list.removeTag(i); - } + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); + if (item.getQuantity() - quantity == 0) { + list.removeTag(i); + } - ItemStack newItem = item.toItemStack(); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); - newItem.stackSize = quantity; + ItemStack newItem = item.toItemStack(); - return newItem; - } - } + newItem.stackSize = quantity; - return null; - } + return newItem; + } + } - @Override - public boolean canPush(ItemStack stack) - { - if (capacity == -1) - { - return true; - } + return null; + } - return (getStored(nbtTag) + stack.stackSize) <= capacity; - } + @Override + public boolean canPush(ItemStack stack) { + if (capacity == -1) { + return true; + } - @Override - public int getPriority() - { - return priority; - } + return (getStored(nbtTag) + stack.stackSize) <= capacity; + } - private StorageItem createItemFromNBT(NBTTagCompound tag) - { - return new StorageItem(Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_DAMAGE), tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null); - } + @Override + public int getPriority() { + return priority; + } - public static int getStored(NBTTagCompound tag) - { - return tag.getInteger(NBT_STORED); - } + private StorageItem createItemFromNBT(NBTTagCompound tag) { + return new StorageItem(Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_DAMAGE), tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null); + } - public static NBTTagCompound getBaseNBT() - { - NBTTagCompound tag = new NBTTagCompound(); + public static int getStored(NBTTagCompound tag) { + return tag.getInteger(NBT_STORED); + } - tag.setTag(NBT_ITEMS, new NBTTagList()); - tag.setInteger(NBT_STORED, 0); + public static NBTTagCompound getBaseNBT() { + NBTTagCompound tag = new NBTTagCompound(); - return tag; - } + tag.setTag(NBT_ITEMS, new NBTTagList()); + tag.setInteger(NBT_STORED, 0); - public static ItemStack initNBT(ItemStack stack) - { - stack.setTagCompound(NBTStorage.getBaseNBT()); + return tag; + } - return stack; - } + public static ItemStack initNBT(ItemStack stack) { + stack.setTagCompound(NBTStorage.getBaseNBT()); + + return stack; + } } diff --git a/src/main/java/refinedstorage/storage/StorageItem.java b/src/main/java/refinedstorage/storage/StorageItem.java old mode 100644 new mode 100755 index 3f0ff9b73..956773032 --- a/src/main/java/refinedstorage/storage/StorageItem.java +++ b/src/main/java/refinedstorage/storage/StorageItem.java @@ -9,199 +9,161 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.util.InventoryUtils; -public class StorageItem -{ - private Item type; - private int quantity; - private int damage; - private NBTTagCompound tag; - @SideOnly(Side.CLIENT) - private int id; +public class StorageItem { + private Item type; + private int quantity; + private int damage; + private NBTTagCompound tag; + @SideOnly(Side.CLIENT) + private int id; - public StorageItem(ByteBuf buf) - { - this.id = buf.readInt(); - this.type = Item.getItemById(buf.readInt()); - this.quantity = buf.readInt(); - this.damage = buf.readInt(); - this.tag = buf.readBoolean() ? ByteBufUtils.readTag(buf) : null; - } + public StorageItem(ByteBuf buf) { + this.id = buf.readInt(); + this.type = Item.getItemById(buf.readInt()); + this.quantity = buf.readInt(); + this.damage = buf.readInt(); + this.tag = buf.readBoolean() ? ByteBufUtils.readTag(buf) : null; + } - public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag) - { - this.type = type; - this.quantity = quantity; - this.damage = damage; - this.tag = tag; - } + public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag) { + this.type = type; + this.quantity = quantity; + this.damage = damage; + this.tag = tag; + } - public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag, int id) - { - this(type, quantity, damage, tag); + public StorageItem(Item type, int quantity, int damage, NBTTagCompound tag, int id) { + this(type, quantity, damage, tag); - this.id = id; - } + this.id = id; + } - public StorageItem(ItemStack stack) - { - this(stack.getItem(), stack.stackSize, stack.getItemDamage(), stack.getTagCompound()); - } + public StorageItem(ItemStack stack) { + this(stack.getItem(), stack.stackSize, stack.getItemDamage(), stack.getTagCompound()); + } - public void toBytes(ByteBuf buf, int id) - { - buf.writeInt(id); - buf.writeInt(Item.getIdFromItem(type)); - buf.writeInt(quantity); - buf.writeInt(damage); - buf.writeBoolean(tag != null); + public void toBytes(ByteBuf buf, int id) { + buf.writeInt(id); + buf.writeInt(Item.getIdFromItem(type)); + buf.writeInt(quantity); + buf.writeInt(damage); + buf.writeBoolean(tag != null); - if (tag != null) - { - ByteBufUtils.writeTag(buf, tag); - } - } + if (tag != null) { + ByteBufUtils.writeTag(buf, tag); + } + } - public Item getType() - { - return type; - } + public Item getType() { + return type; + } - public int getQuantity() - { - return quantity; - } + public int getQuantity() { + return quantity; + } - public void setQuantity(int quantity) - { - this.quantity = quantity; - } + public void setQuantity(int quantity) { + this.quantity = quantity; + } - public int getDamage() - { - return damage; - } + public int getDamage() { + return damage; + } - public void setDamage(int damage) - { - this.damage = damage; - } + public void setDamage(int damage) { + this.damage = damage; + } - public NBTTagCompound getTag() - { - return tag; - } + public NBTTagCompound getTag() { + return tag; + } - public void setTag(NBTTagCompound tag) - { - this.tag = tag; - } + public void setTag(NBTTagCompound tag) { + this.tag = tag; + } - @SideOnly(Side.CLIENT) - public int getId() - { - return id; - } + @SideOnly(Side.CLIENT) + public int getId() { + return id; + } - public StorageItem copy() - { - return copy(quantity); - } + public StorageItem copy() { + return copy(quantity); + } - public StorageItem copy(int newQuantity) - { - return new StorageItem(type, newQuantity, damage, tag); - } + public StorageItem copy(int newQuantity) { + return new StorageItem(type, newQuantity, damage, tag); + } - public ItemStack toItemStack() - { - ItemStack stack = new ItemStack(type, quantity, damage); + public ItemStack toItemStack() { + ItemStack stack = new ItemStack(type, quantity, damage); - stack.setTagCompound(tag); + stack.setTagCompound(tag); - return stack; - } + return stack; + } - public boolean compare(StorageItem other, int flags) - { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) - { - if (damage != other.getDamage()) - { - return false; - } - } + public boolean compare(StorageItem other, int flags) { + if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if (damage != other.getDamage()) { + return false; + } + } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) - { - if ((tag != null && other.getTag() == null) || (tag == null && other.getTag() != null)) - { - return false; - } + if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((tag != null && other.getTag() == null) || (tag == null && other.getTag() != null)) { + return false; + } - if (tag != null && other.getTag() != null) - { - if (!tag.equals(other.getTag())) - { - return false; - } - } - } + if (tag != null && other.getTag() != null) { + if (!tag.equals(other.getTag())) { + return false; + } + } + } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) - { - if (quantity != other.getQuantity()) - { - return false; - } - } + if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if (quantity != other.getQuantity()) { + return false; + } + } - return type == other.getType(); - } + return type == other.getType(); + } - public boolean compare(ItemStack stack, int flags) - { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) - { - if (damage != stack.getItemDamage()) - { - return false; - } - } + public boolean compare(ItemStack stack, int flags) { + if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if (damage != stack.getItemDamage()) { + return false; + } + } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) - { - if ((tag != null && stack.getTagCompound() == null) || (tag == null && stack.getTagCompound() != null)) - { - return false; - } + if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((tag != null && stack.getTagCompound() == null) || (tag == null && stack.getTagCompound() != null)) { + return false; + } - if (tag != null && stack.getTagCompound() != null) - { - if (!tag.equals(stack.getTagCompound())) - { - return false; - } - } - } + if (tag != null && stack.getTagCompound() != null) { + if (!tag.equals(stack.getTagCompound())) { + return false; + } + } + } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) - { - if (quantity != stack.stackSize) - { - return false; - } - } + if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if (quantity != stack.stackSize) { + return false; + } + } - return type == stack.getItem(); - } + return type == stack.getItem(); + } - public boolean compareNoQuantity(StorageItem other) - { - return compare(other, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); - } + public boolean compareNoQuantity(StorageItem other) { + return compare(other, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + } - public boolean compareNoQuantity(ItemStack stack) - { - return compare(stack, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); - } + public boolean compareNoQuantity(ItemStack stack) { + return compare(stack, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + } } diff --git a/src/main/java/refinedstorage/tile/INetworkTile.java b/src/main/java/refinedstorage/tile/INetworkTile.java old mode 100644 new mode 100755 index 6773230c0..4363703d2 --- a/src/main/java/refinedstorage/tile/INetworkTile.java +++ b/src/main/java/refinedstorage/tile/INetworkTile.java @@ -3,11 +3,10 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.util.math.BlockPos; -public interface INetworkTile -{ - public void fromBytes(ByteBuf buf); +public interface INetworkTile { + public void fromBytes(ByteBuf buf); - public void toBytes(ByteBuf buf); + public void toBytes(ByteBuf buf); - public BlockPos getTilePos(); + public BlockPos getTilePos(); } diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java old mode 100644 new mode 100755 index d55a17a04..e5e153ea5 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -15,82 +15,70 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import refinedstorage.RefinedStorage; import refinedstorage.network.MessageTileUpdate; -public abstract class TileBase extends TileEntity implements ITickable -{ - public static final String NBT_DIRECTION = "Direction"; +public abstract class TileBase extends TileEntity implements ITickable { + public static final String NBT_DIRECTION = "Direction"; - public static final int UPDATE_RANGE = 256; + public static final int UPDATE_RANGE = 256; - private EnumFacing direction = EnumFacing.NORTH; + private EnumFacing direction = EnumFacing.NORTH; - protected int ticks; + protected int ticks; - @Override - public void update() - { - ticks++; + @Override + public void update() { + ticks++; - if (!worldObj.isRemote) - { - if (this instanceof INetworkTile) - { - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); + if (!worldObj.isRemote) { + if (this instanceof INetworkTile) { + TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); - } - } - } + RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); + } + } + } - public void setDirection(EnumFacing direction) - { - this.direction = direction; - } + public void setDirection(EnumFacing direction) { + this.direction = direction; + } - public EnumFacing getDirection() - { - return direction; - } + public EnumFacing getDirection() { + return direction; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); - } + direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - } + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + } - @Override - public Packet getDescriptionPacket() - { - NBTTagCompound nbt = new NBTTagCompound(); + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - return new SPacketUpdateTileEntity(pos, 1, nbt); - } + return new SPacketUpdateTileEntity(pos, 1, nbt); + } - @Override - public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) - { - direction = EnumFacing.getFront(packet.getNbtCompound().getInteger(NBT_DIRECTION)); - } + @Override + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { + direction = EnumFacing.getFront(packet.getNbtCompound().getInteger(NBT_DIRECTION)); + } - @Override - public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) - { - return oldState.getBlock() != newState.getBlock(); - } + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } - public IInventory getDroppedInventory() - { - return null; - } + public IInventory getDroppedInventory() { + return null; + } } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java old mode 100644 new mode 100755 index 839e1e6a3..6bdbd3e9f --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -1,80 +1,64 @@ package refinedstorage.tile; -import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -public class TileCable extends TileBase -{ - public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); +import java.util.List; - return tile instanceof TileCable || tile instanceof TileMachine || tile instanceof TileController; - } +public class TileCable extends TileBase { + public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); - public void addMachines(List visited, List machines, TileController controller) - { - for (BlockPos visitedBlock : visited) - { - if (visitedBlock.equals(pos)) - { - return; - } - } + return tile instanceof TileCable || tile instanceof TileMachine || tile instanceof TileController; + } - visited.add(pos); + public void addMachines(List visited, List machines, TileController controller) { + for (BlockPos visitedBlock : visited) { + if (visitedBlock.equals(pos)) { + return; + } + } - for (EnumFacing dir : EnumFacing.VALUES) - { - BlockPos newPos = pos.offset(dir); + visited.add(pos); - boolean alreadyVisited = false; + for (EnumFacing dir : EnumFacing.VALUES) { + BlockPos newPos = pos.offset(dir); - for (BlockPos visitedBlock : visited) - { - if (visitedBlock.equals(newPos)) - { - alreadyVisited = true; - } - } + boolean alreadyVisited = false; - if (alreadyVisited) - { - continue; - } + for (BlockPos visitedBlock : visited) { + if (visitedBlock.equals(newPos)) { + alreadyVisited = true; + } + } - TileEntity tile = worldObj.getTileEntity(newPos); + if (alreadyVisited) { + continue; + } - if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) - { - machines.add((TileMachine) tile); + TileEntity tile = worldObj.getTileEntity(newPos); - visited.add(newPos); + if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) { + machines.add((TileMachine) tile); - if (tile instanceof TileRelay) - { - for (EnumFacing relayDir : EnumFacing.VALUES) - { - TileEntity nextToRelay = worldObj.getTileEntity(newPos.offset(relayDir)); + visited.add(newPos); - if (nextToRelay instanceof TileCable) - { - ((TileCable) nextToRelay).addMachines(visited, machines, controller); - } - } - } - } - else if (tile instanceof TileCable) - { - ((TileCable) tile).addMachines(visited, machines, controller); - } - else if (tile instanceof TileController && !controller.getPos().equals(newPos)) - { - worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true); - } - } - } + if (tile instanceof TileRelay) { + for (EnumFacing relayDir : EnumFacing.VALUES) { + TileEntity nextToRelay = worldObj.getTileEntity(newPos.offset(relayDir)); + + if (nextToRelay instanceof TileCable) { + ((TileCable) nextToRelay).addMachines(visited, machines, controller); + } + } + } + } else if (tile instanceof TileCable) { + ((TileCable) tile).addMachines(visited, machines, controller); + } else if (tile instanceof TileController && !controller.getPos().equals(newPos)) { + worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true); + } + } + } } diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java old mode 100644 new mode 100755 index 9ba0590dc..eb69f69ed --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -10,94 +10,80 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileConstructor extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; +public class TileConstructor extends TileMachine implements ICompareSetting { + public static final String NBT_COMPARE = "Compare"; - private InventorySimple inventory = new InventorySimple("constructor", 1, this); + private InventorySimple inventory = new InventorySimple("constructor", 1, this); - private int compare = 0; + private int compare = 0; - @Override - public int getEnergyUsage() - { - return 1; - } + @Override + public int getEnergyUsage() { + return 1; + } - @Override - public void updateMachine() - { - if (ticks % 10 == 0) - { - BlockPos front = pos.offset(getDirection()); + @Override + public void updateMachine() { + if (ticks % 10 == 0) { + BlockPos front = pos.offset(getDirection()); - if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null) - { - ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare); + if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null) { + ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare); - if (took != null) - { - worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); - } - } - } - } + if (took != null) { + worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); + } + } + } + } - @Override - public int getCompare() - { - return compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public void setCompare(int compare) { + markDirty(); - this.compare = compare; - } + this.compare = compare; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(inventory, 0, nbt); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - } + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - } + buf.writeInt(compare); + } - public IInventory getInventory() - { - return inventory; - } + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java old mode 100644 new mode 100755 index c7e297c48..051f98f25 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -3,9 +3,6 @@ package refinedstorage.tile; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyReceiver; import io.netty.buffer.ByteBuf; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -21,437 +18,370 @@ import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.RedstoneMode; import refinedstorage.util.InventoryUtils; -public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting -{ - private List items = new ArrayList(); - private List storages = new ArrayList(); - - private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - - private List machines = new ArrayList(); - - private List visitedCables = new ArrayList(); - - private EnergyStorage energy = new EnergyStorage(32000); - private int energyUsage; - - private boolean destroyed = false; - - @Override - public void update() - { - super.update(); - - if (destroyed) - { - return; - } - - if (!worldObj.isRemote) - { - int lastEnergy = energy.getEnergyStored(); - - if (ticks % 20 == 0) - { - if (!isActive()) - { - disconnectAll(); - } - else - { - visitedCables.clear(); - - List newMachines = new ArrayList(); - - for (EnumFacing dir : EnumFacing.VALUES) - { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); - - if (tile instanceof TileCable) - { - ((TileCable) tile).addMachines(visitedCables, newMachines, this); - } - } - - for (TileMachine machine : machines) - { - if (!newMachines.contains(machine)) - { - machine.onDisconnected(); - } - } - - for (TileMachine machine : newMachines) - { - if (!machines.contains(machine)) - { - machine.onConnected(this); - } - } - - machines = newMachines; - - storages.clear(); - - for (TileMachine machine : machines) - { - if (machine instanceof IStorageProvider) - { - ((IStorageProvider) machine).addStorages(storages); - } - } - - storages.sort(new Comparator() - { - @Override - public int compare(IStorage s1, IStorage s2) - { - return (s1.getPriority() > s2.getPriority()) ? -1 : 1; - } - }); - - syncItems(); - } - - energyUsage = 10; - - for (TileMachine machine : machines) - { - energyUsage += machine.getEnergyUsage(); - } - - switch (getType()) - { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } - - if (lastEnergy != energy.getEnergyStored()) - { - worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); - } - } - } - } - - public EnumControllerType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) - { - return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); - } - - return EnumControllerType.NORMAL; - } - - public void onDestroyed() - { - disconnectAll(); - - destroyed = true; - } - - private void disconnectAll() - { - for (TileMachine machine : machines) - { - machine.onDisconnected(); - } - - machines.clear(); - } - - public List getMachines() - { - return machines; - } - - public List getItems() - { - return items; - } - - private void syncItems() - { - items.clear(); - - for (IStorage storage : storages) - { - storage.addItems(items); - } - - combineItems(); - } - - private void combineItems() - { - List markedIndexes = new ArrayList(); - - for (int i = 0; i < items.size(); ++i) - { - if (markedIndexes.contains(i)) - { - continue; - } - - StorageItem item = items.get(i); - - for (int j = i + 1; j < items.size(); ++j) - { - if (markedIndexes.contains(j)) - { - continue; - } - - StorageItem other = items.get(j); - - if (item.compareNoQuantity(other)) - { - item.setQuantity(item.getQuantity() + other.getQuantity()); - - markedIndexes.add(j); - } - } - } - - List markedItems = new ArrayList(); - - for (int i : markedIndexes) - { - markedItems.add(items.get(i)); - } - - items.removeAll(markedItems); - } - - public boolean push(ItemStack stack) - { - IStorage foundStorage = null; - - for (IStorage storage : storages) - { - if (storage.canPush(stack)) - { - foundStorage = storage; - - break; - } - } - - if (foundStorage == null) - { - return false; - } - - foundStorage.push(stack); - - syncItems(); - - markDirty(); - - return true; - } - - public ItemStack take(ItemStack stack) - { - markDirty(); - - return take(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); - } - - public ItemStack take(ItemStack stack, int flags) - { - markDirty(); - - int requested = stack.stackSize; - int receiving = 0; - - ItemStack newStack = null; - - for (IStorage storage : storages) - { - ItemStack took = storage.take(stack, flags); - - if (took != null) - { - if (newStack == null) - { - newStack = took; - } - else - { - newStack.stackSize += took.stackSize; - } - - receiving += took.stackSize; - } - - if (requested == receiving) - { - break; - } - } - - syncItems(); - - return newStack; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - energy.readFromNBT(nbt); - - if (nbt.hasKey(RedstoneMode.NBT)) - { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +public class TileController extends TileBase implements IEnergyReceiver, INetworkTile, IRedstoneModeSetting { + private List items = new ArrayList(); + private List storages = new ArrayList(); - energy.writeToNBT(nbt); - - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } + private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) - { - return energy.receiveEnergy(maxReceive, simulate); - } + private List machines = new ArrayList(); - @Override - public int getEnergyStored(EnumFacing from) - { - return energy.getEnergyStored(); - } + private List visitedCables = new ArrayList(); - public int getEnergyScaled(int i) - { - return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i); - } + private EnergyStorage energy = new EnergyStorage(32000); + private int energyUsage; - @Override - public int getMaxEnergyStored(EnumFacing from) - { - return energy.getMaxEnergyStored(); - } + private boolean destroyed = false; - public int getEnergyUsage() - { - return energyUsage; - } - - @Override - public boolean canConnectEnergy(EnumFacing from) - { - return true; - } - - public boolean isActive() - { - return energy.getEnergyStored() >= getEnergyUsage() && redstoneMode.isEnabled(worldObj, pos); - } - - @Override - public RedstoneMode getRedstoneMode() - { - return redstoneMode; - } - - @Override - public void setRedstoneMode(RedstoneMode mode) - { - markDirty(); - - this.redstoneMode = mode; - } - - @Override - public BlockPos getTilePos() - { - return pos; - } - - @Override - public BlockPos getMachinePos() - { - return pos; - } - - @Override - public void fromBytes(ByteBuf buf) - { - int lastEnergy = energy.getEnergyStored(); - - energy.setEnergyStored(buf.readInt()); + @Override + public void update() { + super.update(); - if (lastEnergy != energy.getEnergyStored()) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - - energyUsage = buf.readInt(); - - redstoneMode = RedstoneMode.getById(buf.readInt()); - - items.clear(); - - int size = buf.readInt(); - - for (int i = 0; i < size; ++i) - { - items.add(new StorageItem(buf)); - } - - machines.clear(); - - size = buf.readInt(); - - for (int i = 0; i < size; ++i) - { - TileEntity tile = worldObj.getTileEntity(new BlockPos(buf.readInt(), buf.readInt(), buf.readInt())); - - if (tile instanceof TileMachine) - { - machines.add((TileMachine) tile); - } - } - - } - - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(energy.getEnergyStored()); - buf.writeInt(isActive() ? energyUsage : 0); + if (destroyed) { + return; + } - buf.writeInt(redstoneMode.id); - - buf.writeInt(items.size()); + if (!worldObj.isRemote) { + int lastEnergy = energy.getEnergyStored(); - for (StorageItem item : items) - { - item.toBytes(buf, items.indexOf(item)); - } + if (ticks % 20 == 0) { + if (!isActive()) { + disconnectAll(); + } else { + visitedCables.clear(); - buf.writeInt(machines.size()); + List newMachines = new ArrayList(); - for (TileMachine machine : machines) - { - buf.writeInt(machine.getPos().getX()); - buf.writeInt(machine.getPos().getY()); - buf.writeInt(machine.getPos().getZ()); - } - } + for (EnumFacing dir : EnumFacing.VALUES) { + TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); + + if (tile instanceof TileCable) { + ((TileCable) tile).addMachines(visitedCables, newMachines, this); + } + } + + for (TileMachine machine : machines) { + if (!newMachines.contains(machine)) { + machine.onDisconnected(); + } + } + + for (TileMachine machine : newMachines) { + if (!machines.contains(machine)) { + machine.onConnected(this); + } + } + + machines = newMachines; + + storages.clear(); + + for (TileMachine machine : machines) { + if (machine instanceof IStorageProvider) { + ((IStorageProvider) machine).addStorages(storages); + } + } + + storages.sort(new Comparator() { + @Override + public int compare(IStorage s1, IStorage s2) { + return (s1.getPriority() > s2.getPriority()) ? -1 : 1; + } + }); + + syncItems(); + } + + energyUsage = 10; + + for (TileMachine machine : machines) { + energyUsage += machine.getEnergyUsage(); + } + + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } + + if (lastEnergy != energy.getEnergyStored()) { + worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); + } + } + } + } + + public EnumControllerType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER) { + return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE); + } + + return EnumControllerType.NORMAL; + } + + public void onDestroyed() { + disconnectAll(); + + destroyed = true; + } + + private void disconnectAll() { + for (TileMachine machine : machines) { + machine.onDisconnected(); + } + + machines.clear(); + } + + public List getMachines() { + return machines; + } + + public List getItems() { + return items; + } + + private void syncItems() { + items.clear(); + + for (IStorage storage : storages) { + storage.addItems(items); + } + + combineItems(); + } + + private void combineItems() { + List markedIndexes = new ArrayList(); + + for (int i = 0; i < items.size(); ++i) { + if (markedIndexes.contains(i)) { + continue; + } + + StorageItem item = items.get(i); + + for (int j = i + 1; j < items.size(); ++j) { + if (markedIndexes.contains(j)) { + continue; + } + + StorageItem other = items.get(j); + + if (item.compareNoQuantity(other)) { + item.setQuantity(item.getQuantity() + other.getQuantity()); + + markedIndexes.add(j); + } + } + } + + List markedItems = new ArrayList(); + + for (int i : markedIndexes) { + markedItems.add(items.get(i)); + } + + items.removeAll(markedItems); + } + + public boolean push(ItemStack stack) { + IStorage foundStorage = null; + + for (IStorage storage : storages) { + if (storage.canPush(stack)) { + foundStorage = storage; + + break; + } + } + + if (foundStorage == null) { + return false; + } + + foundStorage.push(stack); + + syncItems(); + + markDirty(); + + return true; + } + + public ItemStack take(ItemStack stack) { + markDirty(); + + return take(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); + } + + public ItemStack take(ItemStack stack, int flags) { + markDirty(); + + int requested = stack.stackSize; + int receiving = 0; + + ItemStack newStack = null; + + for (IStorage storage : storages) { + ItemStack took = storage.take(stack, flags); + + if (took != null) { + if (newStack == null) { + newStack = took; + } else { + newStack.stackSize += took.stackSize; + } + + receiving += took.stackSize; + } + + if (requested == receiving) { + break; + } + } + + syncItems(); + + return newStack; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + energy.readFromNBT(nbt); + + if (nbt.hasKey(RedstoneMode.NBT)) { + redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + energy.writeToNBT(nbt); + + nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); + } + + @Override + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { + return energy.receiveEnergy(maxReceive, simulate); + } + + @Override + public int getEnergyStored(EnumFacing from) { + return energy.getEnergyStored(); + } + + public int getEnergyScaled(int i) { + return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i); + } + + @Override + public int getMaxEnergyStored(EnumFacing from) { + return energy.getMaxEnergyStored(); + } + + public int getEnergyUsage() { + return energyUsage; + } + + @Override + public boolean canConnectEnergy(EnumFacing from) { + return true; + } + + public boolean isActive() { + return energy.getEnergyStored() >= getEnergyUsage() && redstoneMode.isEnabled(worldObj, pos); + } + + @Override + public RedstoneMode getRedstoneMode() { + return redstoneMode; + } + + @Override + public void setRedstoneMode(RedstoneMode mode) { + markDirty(); + + this.redstoneMode = mode; + } + + @Override + public BlockPos getTilePos() { + return pos; + } + + @Override + public BlockPos getMachinePos() { + return pos; + } + + @Override + public void fromBytes(ByteBuf buf) { + int lastEnergy = energy.getEnergyStored(); + + energy.setEnergyStored(buf.readInt()); + + if (lastEnergy != energy.getEnergyStored()) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + + energyUsage = buf.readInt(); + + redstoneMode = RedstoneMode.getById(buf.readInt()); + + items.clear(); + + int size = buf.readInt(); + + for (int i = 0; i < size; ++i) { + items.add(new StorageItem(buf)); + } + + machines.clear(); + + size = buf.readInt(); + + for (int i = 0; i < size; ++i) { + TileEntity tile = worldObj.getTileEntity(new BlockPos(buf.readInt(), buf.readInt(), buf.readInt())); + + if (tile instanceof TileMachine) { + machines.add((TileMachine) tile); + } + } + + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(energy.getEnergyStored()); + buf.writeInt(isActive() ? energyUsage : 0); + + buf.writeInt(redstoneMode.id); + + buf.writeInt(items.size()); + + for (StorageItem item : items) { + item.toBytes(buf, items.indexOf(item)); + } + + buf.writeInt(machines.size()); + + for (TileMachine machine : machines) { + buf.writeInt(machine.getPos().getX()); + buf.writeInt(machine.getPos().getY()); + buf.writeInt(machine.getPos().getZ()); + } + } } diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java old mode 100644 new mode 100755 index a9ec2a100..968968485 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -1,44 +1,38 @@ package refinedstorage.tile; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import refinedstorage.util.InventoryUtils; -public class TileDestructor extends TileMachine -{ - @Override - public int getEnergyUsage() - { - return 1; - } +import java.util.List; - @Override - public void updateMachine() - { - if (ticks % 10 == 0) - { - BlockPos front = pos.offset(getDirection()); +public class TileDestructor extends TileMachine { + @Override + public int getEnergyUsage() { + return 1; + } - IBlockState frontBlockState = worldObj.getBlockState(front); - Block frontBlock = frontBlockState.getBlock(); + @Override + public void updateMachine() { + if (ticks % 10 == 0) { + BlockPos front = pos.offset(getDirection()); - if (!frontBlock.isAir(frontBlockState, worldObj, front)) - { - List drops = frontBlock.getDrops(worldObj, front, worldObj.getBlockState(front), 0); + IBlockState frontBlockState = worldObj.getBlockState(front); + Block frontBlock = frontBlockState.getBlock(); - worldObj.setBlockToAir(front); + if (!frontBlock.isAir(frontBlockState, worldObj, front)) { + List drops = frontBlock.getDrops(worldObj, front, worldObj.getBlockState(front), 0); - for (ItemStack drop : drops) - { - if (!getController().push(drop)) - { - InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); - } - } - } - } - } + worldObj.setBlockToAir(front); + + for (ItemStack drop : drops) { + if (!getController().push(drop)) { + InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); + } + } + } + } + } } diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java old mode 100644 new mode 100755 index 316563289..cb725c1b2 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -10,217 +10,182 @@ import refinedstorage.storage.StorageItem; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileDetector extends TileMachine implements ICompareSetting -{ - public static final int MODE_UNDER = 0; - public static final int MODE_EQUAL = 1; - public static final int MODE_ABOVE = 2; +public class TileDetector extends TileMachine implements ICompareSetting { + public static final int MODE_UNDER = 0; + public static final int MODE_EQUAL = 1; + public static final int MODE_ABOVE = 2; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; - public static final String NBT_AMOUNT = "Amount"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; + public static final String NBT_AMOUNT = "Amount"; - private InventorySimple inventory = new InventorySimple("detector", 1, this); + private InventorySimple inventory = new InventorySimple("detector", 1, this); - private int compare = 0; - private int mode = MODE_EQUAL; - private int amount = 0; + private int compare = 0; + private int mode = MODE_EQUAL; + private int amount = 0; - private boolean powered = false; + private boolean powered = false; - public TileDetector() - { - this.redstoneControlled = false; - } + public TileDetector() { + this.redstoneControlled = false; + } - @Override - public void onDisconnected() - { - super.onDisconnected(); + @Override + public void onDisconnected() { + super.onDisconnected(); - powered = false; - } + powered = false; + } - @Override - public int getEnergyUsage() - { - return 3; - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(0); + @Override + public void updateMachine() { + if (ticks % 5 == 0) { + ItemStack slot = inventory.getStackInSlot(0); - boolean lastPowered = powered; + boolean lastPowered = powered; - if (slot != null) - { - boolean foundAny = false; + if (slot != null) { + boolean foundAny = false; - for (StorageItem item : getController().getItems()) - { - if (item.compare(slot, compare)) - { - foundAny = true; + for (StorageItem item : getController().getItems()) { + if (item.compare(slot, compare)) { + foundAny = true; - switch (mode) - { - case MODE_UNDER: - powered = item.getQuantity() < amount; - break; - case MODE_EQUAL: - powered = item.getQuantity() == amount; - break; - case MODE_ABOVE: - powered = item.getQuantity() > amount; - break; - } + switch (mode) { + case MODE_UNDER: + powered = item.getQuantity() < amount; + break; + case MODE_EQUAL: + powered = item.getQuantity() == amount; + break; + case MODE_ABOVE: + powered = item.getQuantity() > amount; + break; + } - break; - } - } + break; + } + } - if (!foundAny) - { - if (mode == MODE_UNDER && amount != 0) - { - powered = true; - } - else if (mode == MODE_EQUAL && amount == 0) - { - powered = true; - } - else - { - powered = false; - } - } - } - else - { - powered = false; - } + if (!foundAny) { + if (mode == MODE_UNDER && amount != 0) { + powered = true; + } else if (mode == MODE_EQUAL && amount == 0) { + powered = true; + } else { + powered = false; + } + } + } else { + powered = false; + } - if (powered != lastPowered) - { - worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); - } - } - } + if (powered != lastPowered) { + worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); + } + } + } - public boolean isPowered() - { - return powered; - } + public boolean isPowered() { + return powered; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public void setCompare(int compare) { + markDirty(); - this.compare = compare; - } + this.compare = compare; + } - public int getMode() - { - return mode; - } + public int getMode() { + return mode; + } - public void setMode(int mode) - { - markDirty(); + public void setMode(int mode) { + markDirty(); - this.mode = mode; - } + this.mode = mode; + } - public int getAmount() - { - return amount; - } + public int getAmount() { + return amount; + } - public void setAmount(int amount) - { - markDirty(); + public void setAmount(int amount) { + markDirty(); - this.amount = amount; - } + this.amount = amount; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } - if (nbt.hasKey(NBT_AMOUNT)) - { - amount = nbt.getInteger(NBT_AMOUNT); - } + if (nbt.hasKey(NBT_AMOUNT)) { + amount = nbt.getInteger(NBT_AMOUNT); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - nbt.setInteger(NBT_AMOUNT, amount); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + nbt.setInteger(NBT_AMOUNT, amount); - InventoryUtils.saveInventory(inventory, 0, nbt); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - mode = buf.readInt(); - amount = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + amount = buf.readInt(); - boolean lastPowered = powered; + boolean lastPowered = powered; - powered = buf.readBoolean(); + powered = buf.readBoolean(); - if (powered != lastPowered) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } + if (powered != lastPowered) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - buf.writeInt(mode); - buf.writeInt(amount); - buf.writeBoolean(powered); - } + buf.writeInt(compare); + buf.writeInt(mode); + buf.writeInt(amount); + buf.writeBoolean(powered); + } - public IInventory getInventory() - { - return inventory; - } + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java old mode 100644 new mode 100755 index 61d8921b8..66092166d --- a/src/main/java/refinedstorage/tile/TileDrive.java +++ b/src/main/java/refinedstorage/tile/TileDrive.java @@ -1,7 +1,6 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -10,352 +9,297 @@ import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorage; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; -import refinedstorage.storage.CellStorage; -import refinedstorage.storage.IStorage; -import refinedstorage.storage.IStorageGui; -import refinedstorage.storage.IStorageProvider; -import refinedstorage.storage.NBTStorage; +import refinedstorage.storage.*; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.util.InventoryUtils; -public class TileDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareSetting, IModeSetting, IInventory -{ - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +import java.util.List; - private InventorySimple filterInventory = new InventorySimple("filters", 9, this); - private InventorySimple inventory = new InventorySimple("drive", 8, this); +public class TileDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareSetting, IModeSetting, IInventory { + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private int priority = 0; - private int compare = 0; - private int mode = 0; + private InventorySimple filterInventory = new InventorySimple("filters", 9, this); + private InventorySimple inventory = new InventorySimple("drive", 8, this); - @Override - public int getEnergyUsage() - { - int base = 5; + private int priority = 0; + private int compare = 0; + private int mode = 0; - for (int i = 0; i < getSizeInventory(); ++i) - { - if (getStackInSlot(i) != null) - { - base += 2; - } - } + @Override + public int getEnergyUsage() { + int base = 5; - return base; - } + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + base += 2; + } + } - @Override - public void updateMachine() - { - } + return base; + } - @Override - public void addStorages(List storages) - { - for (int i = 0; i < getSizeInventory(); ++i) - { - if (getStackInSlot(i) != null) - { - storages.add(new CellStorage(getStackInSlot(i), this)); - } - } - } + @Override + public void updateMachine() { + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void addStorages(List storages) { + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + storages.add(new CellStorage(getStackInSlot(i), this)); + } + } + } - InventoryUtils.restoreInventory(filterInventory, 0, nbt); - InventoryUtils.restoreInventory(inventory, 1, nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } + InventoryUtils.restoreInventory(filterInventory, 0, nbt); + InventoryUtils.restoreInventory(inventory, 1, nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } - InventoryUtils.saveInventory(filterInventory, 0, nbt); - InventoryUtils.saveInventory(inventory, 1, nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } + InventoryUtils.saveInventory(filterInventory, 0, nbt); + InventoryUtils.saveInventory(inventory, 1, nbt); - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public int getCompare() - { - return compare; - } + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public int getCompare() { + return compare; + } - this.compare = compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public boolean isWhitelist() - { - return mode == 0; - } + this.compare = compare; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public boolean isBlacklist() { + return mode == 1; + } - this.mode = 0; - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public void setToBlacklist() - { - markDirty(); + this.mode = 0; + } - this.mode = 1; - } + @Override + public void setToBlacklist() { + markDirty(); - @Override - public String getName() - { - return "block.refinedstorage:drive.name"; - } + this.mode = 1; + } - @Override - public IInventory getInventory() - { - return filterInventory; - } + @Override + public String getName() { + return "block.refinedstorage:drive.name"; + } - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } + @Override + public IInventory getInventory() { + return filterInventory; + } - @Override - public ICompareSetting getCompareSetting() - { - return this; - } + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } - @Override - public IModeSetting getModeSetting() - { - return this; - } + @Override + public ICompareSetting getCompareSetting() { + return this; + } - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } + @Override + public IModeSetting getModeSetting() { + return this; + } - @Override - public int getPriority() - { - return priority; - } + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } - public void setPriority(int priority) - { - markDirty(); + @Override + public int getPriority() { + return priority; + } - this.priority = priority; - } + public void setPriority(int priority) { + markDirty(); - @Override - public int getStored() - { - int stored = 0; + this.priority = priority; + } - for (int i = 0; i < getSizeInventory(); ++i) - { - ItemStack stack = getStackInSlot(i); + @Override + public int getStored() { + int stored = 0; - if (stack != null) - { - stored += NBTStorage.getStored(stack.getTagCompound()); - } - } + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); - return stored; - } + if (stack != null) { + stored += NBTStorage.getStored(stack.getTagCompound()); + } + } - @Override - public int getCapacity() - { - int capacity = 0; + return stored; + } - for (int i = 0; i < getSizeInventory(); ++i) - { - ItemStack stack = getStackInSlot(i); + @Override + public int getCapacity() { + int capacity = 0; - if (stack != null) - { - int cellCapacity = CellStorage.getCapacity(stack); + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); - if (cellCapacity == -1) - { - return -1; - } + if (stack != null) { + int cellCapacity = CellStorage.getCapacity(stack); - capacity += cellCapacity; - } - } + if (cellCapacity == -1) { + return -1; + } - return capacity; - } + capacity += cellCapacity; + } + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + return capacity; + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public IInventory getDroppedInventory() - { - return inventory; - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public IInventory getDroppedInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java old mode 100644 new mode 100755 index 11282380a..208e1b05b --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -10,138 +10,114 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileExporter extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; +public class TileExporter extends TileMachine implements ICompareSetting { + public static final String NBT_COMPARE = "Compare"; - private InventorySimple inventory = new InventorySimple("exporter", 9, this); + private InventorySimple inventory = new InventorySimple("exporter", 9, this); - private int compare = 0; + private int compare = 0; - @Override - public int getEnergyUsage() - { - return 2; - } + @Override + public int getEnergyUsage() { + return 2; + } - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + @Override + public void updateMachine() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) - { - IInventory connectedInventory = (IInventory) tile; + if (tile instanceof IInventory) { + IInventory connectedInventory = (IInventory) tile; - if (ticks % 5 == 0) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + if (ticks % 5 == 0) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - ItemStack toTake = slot.copy(); + if (slot != null) { + ItemStack toTake = slot.copy(); - toTake.stackSize = 64; + toTake.stackSize = 64; - ItemStack took = getController().take(toTake, compare); + ItemStack took = getController().take(toTake, compare); - if (took != null) - { - if (connectedInventory instanceof ISidedInventory) - { - ISidedInventory sided = (ISidedInventory) connectedInventory; + if (took != null) { + if (connectedInventory instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedInventory; - boolean pushedAny = false; + boolean pushedAny = false; - for (int sidedSlot = 0; sidedSlot < connectedInventory.getSizeInventory(); ++sidedSlot) - { - if (sided.canInsertItem(sidedSlot, took, getDirection().getOpposite()) && InventoryUtils.canPushToInventorySlot(connectedInventory, sidedSlot, took)) - { - InventoryUtils.pushToInventorySlot(connectedInventory, sidedSlot, took); + for (int sidedSlot = 0; sidedSlot < connectedInventory.getSizeInventory(); ++sidedSlot) { + if (sided.canInsertItem(sidedSlot, took, getDirection().getOpposite()) && InventoryUtils.canPushToInventorySlot(connectedInventory, sidedSlot, took)) { + InventoryUtils.pushToInventorySlot(connectedInventory, sidedSlot, took); - pushedAny = true; + pushedAny = true; - break; - } - } + break; + } + } - if (!pushedAny) - { - getController().push(took); - } - } - else if (InventoryUtils.canPushToInventory(connectedInventory, took)) - { - InventoryUtils.pushToInventory(connectedInventory, took); - } - else - { - getController().push(took); - } - } - } - } - } - } - } + if (!pushedAny) { + getController().push(took); + } + } else if (InventoryUtils.canPushToInventory(connectedInventory, took)) { + InventoryUtils.pushToInventory(connectedInventory, took); + } else { + getController().push(took); + } + } + } + } + } + } + } - @Override - public int getCompare() - { - return compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public void setCompare(int compare) { + markDirty(); - this.compare = compare; - } + this.compare = compare; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(inventory, 0, nbt); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - } + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - } + buf.writeInt(compare); + } - public IInventory getInventory() - { - return inventory; - } + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java old mode 100644 new mode 100755 index 6f3e703bc..7342f0441 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -1,7 +1,6 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -21,296 +20,254 @@ import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; -public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting -{ - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +import java.util.List; - private InventorySimple inventory = new InventorySimple("external_storage", 9, this); +public class TileExternalStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private int priority = 0; - private int compare = 0; - private int mode = 0; + private InventorySimple inventory = new InventorySimple("external_storage", 9, this); - @SideOnly(Side.CLIENT) - private int stored = 0; + private int priority = 0; + private int compare = 0; + private int mode = 0; - @Override - public int getEnergyUsage() - { - return 2; - } + @SideOnly(Side.CLIENT) + private int stored = 0; - @Override - public void updateMachine() - { - } + @Override + public int getEnergyUsage() { + return 2; + } - @Override - public void addItems(List items) - { - IInventory connectedInventory = getConnectedInventory(); + @Override + public void updateMachine() { + } - if (connectedInventory != null) - { - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) - { - if (connectedInventory.getStackInSlot(i) != null) - { - items.add(new StorageItem(connectedInventory.getStackInSlot(i))); - } - } - } - } + @Override + public void addItems(List items) { + IInventory connectedInventory = getConnectedInventory(); - @Override - public void push(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); + if (connectedInventory != null) { + for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) { + if (connectedInventory.getStackInSlot(i) != null) { + items.add(new StorageItem(connectedInventory.getStackInSlot(i))); + } + } + } + } - if (connectedInventory == null) - { - return; - } + @Override + public void push(ItemStack stack) { + IInventory connectedInventory = getConnectedInventory(); - InventoryUtils.pushToInventory(connectedInventory, stack); - } + if (connectedInventory == null) { + return; + } - @Override - public ItemStack take(ItemStack stack, int flags) - { - IInventory connectedInventory = getConnectedInventory(); + InventoryUtils.pushToInventory(connectedInventory, stack); + } - if (connectedInventory == null) - { - return null; - } + @Override + public ItemStack take(ItemStack stack, int flags) { + IInventory connectedInventory = getConnectedInventory(); - int quantity = stack.stackSize; + if (connectedInventory == null) { + return null; + } - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) - { - ItemStack slot = connectedInventory.getStackInSlot(i); + int quantity = stack.stackSize; - if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) - { - if (quantity > slot.stackSize) - { - quantity = slot.stackSize; - } + for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) { + ItemStack slot = connectedInventory.getStackInSlot(i); - slot.stackSize -= quantity; + if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { + if (quantity > slot.stackSize) { + quantity = slot.stackSize; + } - if (slot.stackSize == 0) - { - connectedInventory.setInventorySlotContents(i, null); - } + slot.stackSize -= quantity; - ItemStack newItem = slot.copy(); + if (slot.stackSize == 0) { + connectedInventory.setInventorySlotContents(i, null); + } - newItem.stackSize = quantity; + ItemStack newItem = slot.copy(); - return newItem; - } - } + newItem.stackSize = quantity; - return null; - } + return newItem; + } + } - @Override - public boolean canPush(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); + return null; + } - if (connectedInventory == null) - { - return false; - } + @Override + public boolean canPush(ItemStack stack) { + IInventory connectedInventory = getConnectedInventory(); - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); - } + if (connectedInventory == null) { + return false; + } - public IInventory getConnectedInventory() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); + } - if (tile instanceof IInventory) - { - return (IInventory) tile; - } + public IInventory getConnectedInventory() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - return null; - } + if (tile instanceof IInventory) { + return (IInventory) tile; + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + return null; + } - buf.writeInt(priority); - buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); - buf.writeInt(compare); - buf.writeInt(mode); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + buf.writeInt(priority); + buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); + buf.writeInt(compare); + buf.writeInt(mode); + } - priority = buf.readInt(); - stored = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + priority = buf.readInt(); + stored = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } - InventoryUtils.saveInventory(inventory, 0, nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } + InventoryUtils.saveInventory(inventory, 0, nbt); - @Override - public int getCompare() - { - return compare; - } + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public int getCompare() { + return compare; + } - this.compare = compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public boolean isWhitelist() - { - return mode == 0; - } + this.compare = compare; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public boolean isBlacklist() { + return mode == 1; + } - this.mode = 0; - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public void setToBlacklist() - { - markDirty(); + this.mode = 0; + } - this.mode = 1; - } + @Override + public void setToBlacklist() { + markDirty(); - @Override - public int getPriority() - { - return priority; - } + this.mode = 1; + } - public void setPriority(int priority) - { - markDirty(); + @Override + public int getPriority() { + return priority; + } - this.priority = priority; - } + public void setPriority(int priority) { + markDirty(); - @Override - public void addStorages(List storages) - { - storages.add(this); - } + this.priority = priority; + } - @Override - public String getName() - { - return "gui.refinedstorage:external_storage"; - } + @Override + public void addStorages(List storages) { + storages.add(this); + } - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } + @Override + public String getName() { + return "gui.refinedstorage:external_storage"; + } - @Override - public ICompareSetting getCompareSetting() - { - return this; - } + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } - @Override - public IModeSetting getModeSetting() - { - return this; - } + @Override + public ICompareSetting getCompareSetting() { + return this; + } - @Override - public int getStored() - { - return stored; - } + @Override + public IModeSetting getModeSetting() { + return this; + } - @Override - public int getCapacity() - { - if (getConnectedInventory() == null) - { - return 0; - } + @Override + public int getStored() { + return stored; + } - return getConnectedInventory().getSizeInventory() * 64; - } + @Override + public int getCapacity() { + if (getConnectedInventory() == null) { + return 0; + } - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } + return getConnectedInventory().getSizeInventory() * 64; + } - @Override - public IInventory getInventory() - { - return inventory; - } + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } + + @Override + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java old mode 100644 new mode 100755 index 7b67098eb..f2de01a0e --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -18,184 +18,155 @@ import refinedstorage.network.MessageGridCraftingUpdate; import refinedstorage.storage.StorageItem; import refinedstorage.util.InventoryUtils; -public class TileGrid extends TileMachine -{ - public static final String NBT_SORTING_DIRECTION = "SortingDirection"; - public static final String NBT_SORTING_TYPE = "SortingType"; +public class TileGrid extends TileMachine { + public static final String NBT_SORTING_DIRECTION = "SortingDirection"; + public static final String NBT_SORTING_TYPE = "SortingType"; - public static final int SORTING_DIRECTION_ASCENDING = 0; - public static final int SORTING_DIRECTION_DESCENDING = 1; + public static final int SORTING_DIRECTION_ASCENDING = 0; + public static final int SORTING_DIRECTION_DESCENDING = 1; - public static final int SORTING_TYPE_QUANTITY = 0; - public static final int SORTING_TYPE_NAME = 1; + public static final int SORTING_TYPE_QUANTITY = 0; + public static final int SORTING_TYPE_NAME = 1; - private Container craftingContainer = new Container() - { - @Override - public boolean canInteractWith(EntityPlayer player) - { - return false; - } + private Container craftingContainer = new Container() { + @Override + public boolean canInteractWith(EntityPlayer player) { + return false; + } - @Override - public void onCraftMatrixChanged(IInventory inventory) - { - onCraftingMatrixChanged(); - } - }; - private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3); - private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1); + @Override + public void onCraftMatrixChanged(IInventory inventory) { + onCraftingMatrixChanged(); + } + }; + private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3); + private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1); - private int sortingDirection = 0; - private int sortingType = 0; + private int sortingDirection = 0; + private int sortingType = 0; - @Override - public int getEnergyUsage() - { - return 4; - } + @Override + public int getEnergyUsage() { + return 4; + } - @Override - public void updateMachine() - { - } + @Override + public void updateMachine() { + } - public EnumGridType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) - { - return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); - } + public EnumGridType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) { + return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); + } - return EnumGridType.NORMAL; - } + return EnumGridType.NORMAL; + } - public InventoryCrafting getCraftingInventory() - { - return craftingInventory; - } + public InventoryCrafting getCraftingInventory() { + return craftingInventory; + } - public InventorySimple getCraftingResultInventory() - { - return craftingResultInventory; - } + public InventorySimple getCraftingResultInventory() { + return craftingResultInventory; + } - public void onCraftingMatrixChanged() - { - markDirty(); + public void onCraftingMatrixChanged() { + markDirty(); - craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); - } + craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); + } - public void onCrafted(ItemStack[] matrixSlots) - { - if (isConnected() && !worldObj.isRemote) - { - for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) - { - ItemStack slot = craftingInventory.getStackInSlot(i); + public void onCrafted(ItemStack[] matrixSlots) { + if (isConnected() && !worldObj.isRemote) { + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + ItemStack slot = craftingInventory.getStackInSlot(i); - if (slot == null && matrixSlots[i] != null) - { - for (StorageItem item : getController().getItems()) - { - if (item.compareNoQuantity(matrixSlots[i].copy())) - { - craftingInventory.setInventorySlotContents(i, getController().take(matrixSlots[i].copy())); + if (slot == null && matrixSlots[i] != null) { + for (StorageItem item : getController().getItems()) { + if (item.compareNoQuantity(matrixSlots[i].copy())) { + craftingInventory.setInventorySlotContents(i, getController().take(matrixSlots[i].copy())); - break; - } - } - } - } + break; + } + } + } + } - onCraftingMatrixChanged(); + onCraftingMatrixChanged(); - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); + TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); - } - } + RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); + } + } - public int getSortingDirection() - { - return sortingDirection; - } + public int getSortingDirection() { + return sortingDirection; + } - public void setSortingDirection(int sortingDirection) - { - markDirty(); + public void setSortingDirection(int sortingDirection) { + markDirty(); - this.sortingDirection = sortingDirection; - } + this.sortingDirection = sortingDirection; + } - public int getSortingType() - { - return sortingType; - } + public int getSortingType() { + return sortingType; + } - public void setSortingType(int sortingType) - { - markDirty(); + public void setSortingType(int sortingType) { + markDirty(); - this.sortingType = sortingType; - } + this.sortingType = sortingType; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - InventoryUtils.restoreInventory(craftingInventory, 0, nbt); + InventoryUtils.restoreInventory(craftingInventory, 0, nbt); - if (nbt.hasKey(NBT_SORTING_DIRECTION)) - { - sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); - } + if (nbt.hasKey(NBT_SORTING_DIRECTION)) { + sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); + } - if (nbt.hasKey(NBT_SORTING_TYPE)) - { - sortingType = nbt.getInteger(NBT_SORTING_TYPE); - } - } + if (nbt.hasKey(NBT_SORTING_TYPE)) { + sortingType = nbt.getInteger(NBT_SORTING_TYPE); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - InventoryUtils.saveInventory(craftingInventory, 0, nbt); + InventoryUtils.saveInventory(craftingInventory, 0, nbt); - nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); - nbt.setInteger(NBT_SORTING_TYPE, sortingType); - } + nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); + nbt.setInteger(NBT_SORTING_TYPE, sortingType); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(sortingDirection); - buf.writeInt(sortingType); - } + buf.writeInt(sortingDirection); + buf.writeInt(sortingType); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - sortingDirection = buf.readInt(); - sortingType = buf.readInt(); - } + sortingDirection = buf.readInt(); + sortingType = buf.readInt(); + } - @Override - public IInventory getDroppedInventory() - { - if (getType() == EnumGridType.CRAFTING) - { - return craftingInventory; - } + @Override + public IInventory getDroppedInventory() { + if (getType() == EnumGridType.CRAFTING) { + return craftingInventory; + } - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java old mode 100644 new mode 100755 index 4f42538b4..9348bf5de --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -11,204 +11,169 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.util.InventoryUtils; -public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting -{ - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +public class TileImporter extends TileMachine implements ICompareSetting, IModeSetting { + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private InventorySimple inventory = new InventorySimple("importer", 9, this); + private InventorySimple inventory = new InventorySimple("importer", 9, this); - private int compare = 0; - private int mode = 0; + private int compare = 0; + private int mode = 0; - private int currentSlot = 0; + private int currentSlot = 0; - @Override - public int getEnergyUsage() - { - return 2; - } + @Override + public int getEnergyUsage() { + return 2; + } - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + @Override + public void updateMachine() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) - { - IInventory connectedInventory = (IInventory) tile; + if (tile instanceof IInventory) { + IInventory connectedInventory = (IInventory) tile; - if (ticks % 5 == 0) - { - ItemStack slot = connectedInventory.getStackInSlot(currentSlot); + if (ticks % 5 == 0) { + ItemStack slot = connectedInventory.getStackInSlot(currentSlot); - while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; + while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) { + currentSlot++; - if (currentSlot > connectedInventory.getSizeInventory() - 1) - { - break; - } - } + if (currentSlot > connectedInventory.getSizeInventory() - 1) { + break; + } + } - if (slot != null && canImport(slot)) - { - if (connectedInventory instanceof ISidedInventory) - { - ISidedInventory sided = (ISidedInventory) connectedInventory; + if (slot != null && canImport(slot)) { + if (connectedInventory instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedInventory; - if (sided.canExtractItem(currentSlot, slot.copy(), getDirection().getOpposite())) - { - if (getController().push(slot.copy())) - { - connectedInventory.setInventorySlotContents(currentSlot, null); - } - } - } - else if (getController().push(slot.copy())) - { - connectedInventory.setInventorySlotContents(currentSlot, null); - } + if (sided.canExtractItem(currentSlot, slot.copy(), getDirection().getOpposite())) { + if (getController().push(slot.copy())) { + connectedInventory.setInventorySlotContents(currentSlot, null); + } + } + } else if (getController().push(slot.copy())) { + connectedInventory.setInventorySlotContents(currentSlot, null); + } - connectedInventory.markDirty(); - } + connectedInventory.markDirty(); + } - currentSlot++; + currentSlot++; - if (currentSlot > connectedInventory.getSizeInventory() - 1) - { - currentSlot = 0; - } - } - } - } + if (currentSlot > connectedInventory.getSizeInventory() - 1) { + currentSlot = 0; + } + } + } + } - public boolean canImport(ItemStack stack) - { - int slots = 0; + public boolean canImport(ItemStack stack) { + int slots = 0; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - slots++; + if (slot != null) { + slots++; - if (InventoryUtils.compareStack(stack, slot, compare)) - { - if (isWhitelist()) - { - return true; - } - else if (isBlacklist()) - { - return false; - } - } - } - } + if (InventoryUtils.compareStack(stack, slot, compare)) { + if (isWhitelist()) { + return true; + } else if (isBlacklist()) { + return false; + } + } + } + } - if (isWhitelist()) - { - return slots == 0; - } + if (isWhitelist()) { + return slots == 0; + } - return true; - } + return true; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public void setCompare(int compare) { + markDirty(); - this.compare = compare; - } + this.compare = compare; + } - @Override - public boolean isWhitelist() - { - return mode == 0; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public boolean isBlacklist() { + return mode == 1; + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public void setToWhitelist() { + markDirty(); - this.mode = 0; - } + this.mode = 0; + } - @Override - public void setToBlacklist() - { - markDirty(); + @Override + public void setToBlacklist() { + markDirty(); - this.mode = 1; - } + this.mode = 1; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); - InventoryUtils.saveInventory(inventory, 0, nbt); - } + InventoryUtils.saveInventory(inventory, 0, nbt); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - mode = buf.readInt(); - } + compare = buf.readInt(); + mode = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - buf.writeInt(mode); - } + buf.writeInt(compare); + buf.writeInt(mode); + } - public IInventory getInventory() - { - return inventory; - } + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java old mode 100644 new mode 100755 index bf0158de2..a7a45caca --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,311 +12,255 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory -{ - public static final String NBT_COMPARE = "Compare"; +public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory { + public static final String NBT_COMPARE = "Compare"; - private InventorySimple inventory = new InventorySimple("interface", 9 * 3); + private InventorySimple inventory = new InventorySimple("interface", 9 * 3); - private int compare = 0; + private int compare = 0; - private int currentSlot = 0; + private int currentSlot = 0; - @Override - public int getEnergyUsage() - { - return 4; - } + @Override + public int getEnergyUsage() { + return 4; + } - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(currentSlot); + @Override + public void updateMachine() { + if (ticks % 5 == 0) { + ItemStack slot = inventory.getStackInSlot(currentSlot); - while ((slot = inventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; + while ((slot = inventory.getStackInSlot(currentSlot)) == null) { + currentSlot++; - if (currentSlot > 8) - { - break; - } - } + if (currentSlot > 8) { + break; + } + } - if (inventory.getStackInSlot(currentSlot) != null) - { - if (getController().push(slot)) - { - inventory.setInventorySlotContents(currentSlot, null); - } - } + if (inventory.getStackInSlot(currentSlot) != null) { + if (getController().push(slot)) { + inventory.setInventorySlotContents(currentSlot, null); + } + } - currentSlot++; + currentSlot++; - if (currentSlot > 8) - { - currentSlot = 0; - } - } + if (currentSlot > 8) { + currentSlot = 0; + } + } - for (int i = 9; i < 18; ++i) - { - ItemStack wanted = inventory.getStackInSlot(i); - ItemStack got = inventory.getStackInSlot(i + 9); + for (int i = 9; i < 18; ++i) { + ItemStack wanted = inventory.getStackInSlot(i); + ItemStack got = inventory.getStackInSlot(i + 9); - if (wanted != null) - { - boolean ok = false; + if (wanted != null) { + boolean ok = false; - if (got != null) - { - if (!InventoryUtils.compareStack(wanted, got, compare)) - { - if (getController().push(got)) - { - inventory.setInventorySlotContents(i + 9, null); - } - } - else - { - ok = true; - } - } - else - { - ok = true; - } + if (got != null) { + if (!InventoryUtils.compareStack(wanted, got, compare)) { + if (getController().push(got)) { + inventory.setInventorySlotContents(i + 9, null); + } + } else { + ok = true; + } + } else { + ok = true; + } - if (ok) - { - got = inventory.getStackInSlot(i + 9); + if (ok) { + got = inventory.getStackInSlot(i + 9); - int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; + int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; - ItemStack goingToTake = wanted.copy(); - goingToTake.stackSize = needed; + ItemStack goingToTake = wanted.copy(); + goingToTake.stackSize = needed; - ItemStack took = getController().take(goingToTake, compare); + ItemStack took = getController().take(goingToTake, compare); - if (took != null) - { - if (got == null) - { - inventory.setInventorySlotContents(i + 9, took); - } - else - { - got.stackSize += took.stackSize; - } - } - } - } - else if (got != null) - { - if (getController().push(got)) - { - inventory.setInventorySlotContents(i + 9, null); - } - } - } - } + if (took != null) { + if (got == null) { + inventory.setInventorySlotContents(i + 9, took); + } else { + got.stackSize += took.stackSize; + } + } + } + } else if (got != null) { + if (getController().push(got)) { + inventory.setInventorySlotContents(i + 9, null); + } + } + } + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); + InventoryUtils.restoreInventory(this, 0, nbt); - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); + InventoryUtils.saveInventory(this, 0, nbt); - nbt.setInteger(NBT_COMPARE, compare); - } + nbt.setInteger(NBT_COMPARE, compare); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - compare = buf.readInt(); - } + compare = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeInt(compare); - } + buf.writeInt(compare); + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public String getName() - { - return inventory.getName(); - } + @Override + public String getName() { + return inventory.getName(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } - @Override - public IInventory getDroppedInventory() - { - InventorySimple dummy = new InventorySimple("dummy", 9); + @Override + public IInventory getDroppedInventory() { + InventorySimple dummy = new InventorySimple("dummy", 9); - for (int i = 0; i < 9; ++i) - { - dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); - } + for (int i = 0; i < 9; ++i) { + dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); + } - return dummy; - } + return dummy; + } - @Override - public int[] getSlotsForFace(EnumFacing side) - { - if (side == EnumFacing.DOWN) - { - return new int[] - { - 18, 19, 20, 21, 22, 23, 24, 25, 26 - }; - } + @Override + public int[] getSlotsForFace(EnumFacing side) { + if (side == EnumFacing.DOWN) { + return new int[] + { + 18, 19, 20, 21, 22, 23, 24, 25, 26 + }; + } - return new int[] - { - 0, 1, 2, 3, 4, 5, 6, 7, 8 - }; - } + return new int[] + { + 0, 1, 2, 3, 4, 5, 6, 7, 8 + }; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) - { - return slot < 9; - } + @Override + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing side) { + return slot < 9; + } - @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) - { - return slot >= 18; - } + @Override + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing side) { + return slot >= 18; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public int getCompare() { + return compare; + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public void setCompare(int compare) { + markDirty(); - this.compare = compare; - } + this.compare = compare; + } } diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java old mode 100644 new mode 100755 index 2a802f960..e82e6250c --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -8,153 +8,130 @@ import refinedstorage.block.BlockMachine; import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.RedstoneMode; -public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting -{ - protected boolean connected = false; - protected boolean redstoneControlled = true; +public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { + protected boolean connected = false; + protected boolean redstoneControlled = true; - protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; + protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; - private BlockPos controllerPosition; + private BlockPos controllerPosition; - private Block originalBlock; + private Block originalBlock; - public void onConnected(TileController controller) - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); + public void onConnected(TileController controller) { + if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); - connected = true; + connected = true; - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); - controllerPosition = controller.getPos(); - } - } + controllerPosition = controller.getPos(); + } + } - public void onDisconnected() - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); + public void onDisconnected() { + if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); - connected = false; + connected = false; - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); - } - } + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); + } + } - @Override - public void update() - { - if (ticks == 0) - { - originalBlock = worldObj.getBlockState(pos).getBlock(); - } + @Override + public void update() { + if (ticks == 0) { + originalBlock = worldObj.getBlockState(pos).getBlock(); + } - super.update(); + super.update(); - if (!worldObj.isRemote && isConnected()) - { - updateMachine(); - } - } + if (!worldObj.isRemote && isConnected()) { + updateMachine(); + } + } - public boolean isConnected() - { - return connected; - } + public boolean isConnected() { + return connected; + } - @Override - public RedstoneMode getRedstoneMode() - { - return redstoneMode; - } + @Override + public RedstoneMode getRedstoneMode() { + return redstoneMode; + } - @Override - public void setRedstoneMode(RedstoneMode mode) - { - if (redstoneControlled) - { - markDirty(); + @Override + public void setRedstoneMode(RedstoneMode mode) { + if (redstoneControlled) { + markDirty(); - this.redstoneMode = mode; - } - } + this.redstoneMode = mode; + } + } - @Override - public BlockPos getMachinePos() - { - return pos; - } + @Override + public BlockPos getMachinePos() { + return pos; + } - @Override - public BlockPos getTilePos() - { - return pos; - } + @Override + public BlockPos getTilePos() { + return pos; + } - public TileController getController() - { - return (TileController) worldObj.getTileEntity(controllerPosition); - } + public TileController getController() { + return (TileController) worldObj.getTileEntity(controllerPosition); + } - @Override - public void fromBytes(ByteBuf buf) - { - boolean lastConnected = connected; + @Override + public void fromBytes(ByteBuf buf) { + boolean lastConnected = connected; - connected = buf.readBoolean(); + connected = buf.readBoolean(); - if (connected) - { - controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); - } + if (connected) { + controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); + } - redstoneMode = RedstoneMode.getById(buf.readInt()); + redstoneMode = RedstoneMode.getById(buf.readInt()); - if (lastConnected != connected) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } + if (lastConnected != connected) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } - @Override - public void toBytes(ByteBuf buf) - { - buf.writeBoolean(connected); + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(connected); - if (connected) - { - buf.writeInt(controllerPosition.getX()); - buf.writeInt(controllerPosition.getY()); - buf.writeInt(controllerPosition.getZ()); - } + if (connected) { + buf.writeInt(controllerPosition.getX()); + buf.writeInt(controllerPosition.getY()); + buf.writeInt(controllerPosition.getZ()); + } - buf.writeInt(redstoneMode.id); - } + buf.writeInt(redstoneMode.id); + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(RedstoneMode.NBT)) - { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } - } + if (nbt.hasKey(RedstoneMode.NBT)) { + redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } + nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); + } - public abstract int getEnergyUsage(); + public abstract int getEnergyUsage(); - public abstract void updateMachine(); + public abstract void updateMachine(); } diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java old mode 100644 new mode 100755 index ed183e83d..572fbf713 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -2,21 +2,17 @@ package refinedstorage.tile; import refinedstorage.tile.settings.RedstoneMode; -public class TileRelay extends TileMachine -{ - public TileRelay() - { - this.redstoneMode = RedstoneMode.LOW; - } +public class TileRelay extends TileMachine { + public TileRelay() { + this.redstoneMode = RedstoneMode.LOW; + } - @Override - public int getEnergyUsage() - { - return 1; - } + @Override + public int getEnergyUsage() { + return 1; + } - @Override - public void updateMachine() - { - } + @Override + public void updateMachine() { + } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java old mode 100644 new mode 100755 index 59110ab69..8c67e439f --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -15,288 +15,243 @@ import refinedstorage.tile.solderer.ISoldererRecipe; import refinedstorage.tile.solderer.SoldererRegistry; import refinedstorage.util.InventoryUtils; -public class TileSolderer extends TileMachine implements IInventory, ISidedInventory -{ - public static final String NBT_WORKING = "Working"; - public static final String NBT_PROGRESS = "Progress"; +public class TileSolderer extends TileMachine implements IInventory, ISidedInventory { + public static final String NBT_WORKING = "Working"; + public static final String NBT_PROGRESS = "Progress"; - private InventorySimple inventory = new InventorySimple("solderer", 4); + private InventorySimple inventory = new InventorySimple("solderer", 4); - private ISoldererRecipe recipe; + private ISoldererRecipe recipe; - private boolean working = false; - private int progress = 0; - @SideOnly(Side.CLIENT) - private int duration; + private boolean working = false; + private int progress = 0; + @SideOnly(Side.CLIENT) + private int duration; - @Override - public int getEnergyUsage() - { - return 3; - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public void updateMachine() - { - ISoldererRecipe newRecipe = SoldererRegistry.getRecipe(inventory); + @Override + public void updateMachine() { + ISoldererRecipe newRecipe = SoldererRegistry.getRecipe(inventory); - if (newRecipe == null) - { - reset(); - } - else if (newRecipe != recipe && inventory.getStackInSlot(3) == null) - { - recipe = newRecipe; - progress = 0; - working = true; + if (newRecipe == null) { + reset(); + } else if (newRecipe != recipe && inventory.getStackInSlot(3) == null) { + recipe = newRecipe; + progress = 0; + working = true; - markDirty(); - } - else if (working) - { - progress++; + markDirty(); + } else if (working) { + progress++; - if (progress == recipe.getDuration()) - { - inventory.setInventorySlotContents(3, recipe.getResult()); + if (progress == recipe.getDuration()) { + inventory.setInventorySlotContents(3, recipe.getResult()); - for (int i = 0; i < 3; ++i) - { - if (recipe.getRow(i) != null) - { - inventory.decrStackSize(i, recipe.getRow(i).stackSize); - } - } + for (int i = 0; i < 3; ++i) { + if (recipe.getRow(i) != null) { + inventory.decrStackSize(i, recipe.getRow(i).stackSize); + } + } - reset(); - } - } - } + reset(); + } + } + } - @Override - public void onDisconnected() - { - super.onDisconnected(); + @Override + public void onDisconnected() { + super.onDisconnected(); - reset(); - } + reset(); + } - public void reset() - { - progress = 0; - working = false; - recipe = null; + public void reset() { + progress = 0; + working = false; + recipe = null; - markDirty(); - } + markDirty(); + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); + InventoryUtils.restoreInventory(this, 0, nbt); - recipe = SoldererRegistry.getRecipe(inventory); + recipe = SoldererRegistry.getRecipe(inventory); - if (nbt.hasKey(NBT_WORKING)) - { - working = nbt.getBoolean(NBT_WORKING); - } + if (nbt.hasKey(NBT_WORKING)) { + working = nbt.getBoolean(NBT_WORKING); + } - if (nbt.hasKey(NBT_PROGRESS)) - { - progress = nbt.getInteger(NBT_PROGRESS); - } - } + if (nbt.hasKey(NBT_PROGRESS)) { + progress = nbt.getInteger(NBT_PROGRESS); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); + InventoryUtils.saveInventory(this, 0, nbt); - nbt.setBoolean(NBT_WORKING, working); - nbt.setInteger(NBT_PROGRESS, progress); - } + nbt.setBoolean(NBT_WORKING, working); + nbt.setInteger(NBT_PROGRESS, progress); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - working = buf.readBoolean(); - progress = buf.readInt(); - duration = buf.readInt(); - } + working = buf.readBoolean(); + progress = buf.readInt(); + duration = buf.readInt(); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeBoolean(working); - buf.writeInt(progress); - buf.writeInt(recipe != null ? recipe.getDuration() : 0); - } + buf.writeBoolean(working); + buf.writeInt(progress); + buf.writeInt(recipe != null ? recipe.getDuration() : 0); + } - public boolean isWorking() - { - return working; - } + public boolean isWorking() { + return working; + } - public int getProgress() - { - return progress; - } + public int getProgress() { + return progress; + } - @SideOnly(Side.CLIENT) - public int getProgressScaled(int i) - { - return (int) ((float) progress / (float) duration * (float) i); - } + @SideOnly(Side.CLIENT) + public int getProgressScaled(int i) { + return (int) ((float) progress / (float) duration * (float) i); + } - @SideOnly(Side.CLIENT) - public int getDuration() - { - return duration; - } + @SideOnly(Side.CLIENT) + public int getDuration() { + return duration; + } - @Override - public IInventory getDroppedInventory() - { - return inventory; - } + @Override + public IInventory getDroppedInventory() { + return inventory; + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public String getName() - { - return inventory.getName(); - } + @Override + public String getName() { + return inventory.getName(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } - @Override - public int[] getSlotsForFace(EnumFacing side) - { - if (side != EnumFacing.DOWN) - { - return new int[] - { - 0, 1, 2 - }; - } + @Override + public int[] getSlotsForFace(EnumFacing side) { + if (side != EnumFacing.DOWN) { + return new int[] + { + 0, 1, 2 + }; + } - return new int[] - { - 3 - }; - } + return new int[] + { + 3 + }; + } - @Override - public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) - { - return slot != 3; - } + @Override + public boolean canInsertItem(int slot, ItemStack stack, EnumFacing direction) { + return slot != 3; + } - @Override - public boolean canExtractItem(int slot, ItemStack stack, EnumFacing direction) - { - return slot == 3; - } + @Override + public boolean canExtractItem(int slot, ItemStack stack, EnumFacing direction) { + return slot == 3; + } } diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java old mode 100644 new mode 100755 index 771dc0487..ee20e65f6 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -1,7 +1,6 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,284 +12,243 @@ import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; -import refinedstorage.storage.IStorage; -import refinedstorage.storage.IStorageGui; -import refinedstorage.storage.IStorageProvider; -import refinedstorage.storage.NBTStorage; -import refinedstorage.storage.StorageItem; +import refinedstorage.storage.*; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; -public class TileStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting -{ - public static final String NBT_STORAGE = "Storage"; - public static final String NBT_PRIORITY = "Priority"; - public static final String NBT_COMPARE = "Compare"; - public static final String NBT_MODE = "Mode"; +import java.util.List; - private InventorySimple inventory = new InventorySimple("storage", 9, this); +public class TileStorage extends TileMachine implements IStorageProvider, IStorage, IStorageGui, ICompareSetting, IModeSetting { + public static final String NBT_STORAGE = "Storage"; + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; - private NBTTagCompound tag = NBTStorage.getBaseNBT(); + private InventorySimple inventory = new InventorySimple("storage", 9, this); - private int priority = 0; - private int compare = 0; - private int mode = 0; + private NBTTagCompound tag = NBTStorage.getBaseNBT(); - @SideOnly(Side.CLIENT) - private int stored; + private int priority = 0; + private int compare = 0; + private int mode = 0; - @Override - public int getEnergyUsage() - { - return 3; - } + @SideOnly(Side.CLIENT) + private int stored; - @Override - public void updateMachine() - { - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public void addStorages(List storages) - { - storages.add(this); - } + @Override + public void updateMachine() { + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void addStorages(List storages) { + storages.add(this); + } - InventoryUtils.restoreInventory(inventory, 0, nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - if (nbt.hasKey(NBT_STORAGE)) - { - tag = nbt.getCompoundTag(NBT_STORAGE); - } + InventoryUtils.restoreInventory(inventory, 0, nbt); - if (nbt.hasKey(NBT_PRIORITY)) - { - priority = nbt.getInteger(NBT_PRIORITY); - } + if (nbt.hasKey(NBT_STORAGE)) { + tag = nbt.getCompoundTag(NBT_STORAGE); + } - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } - if (nbt.hasKey(NBT_MODE)) - { - mode = nbt.getInteger(NBT_MODE); - } - } + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } - InventoryUtils.saveInventory(inventory, 0, nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - nbt.setTag(NBT_STORAGE, tag); - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } + InventoryUtils.saveInventory(inventory, 0, nbt); - public EnumStorageType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) - { - return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); - } + nbt.setTag(NBT_STORAGE, tag); + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } - return EnumStorageType.TYPE_1K; - } + public EnumStorageType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) { + return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + return EnumStorageType.TYPE_1K; + } - buf.writeInt(NBTStorage.getStored(tag)); - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + buf.writeInt(NBTStorage.getStored(tag)); + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } - stored = buf.readInt(); - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - @Override - public void addItems(List items) - { - getStorage().addItems(items); + stored = buf.readInt(); + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } - markDirty(); - } + @Override + public void addItems(List items) { + getStorage().addItems(items); - @Override - public void push(ItemStack stack) - { - getStorage().push(stack); + markDirty(); + } - markDirty(); - } + @Override + public void push(ItemStack stack) { + getStorage().push(stack); - @Override - public ItemStack take(ItemStack stack, int flags) - { - ItemStack result = getStorage().take(stack, flags); + markDirty(); + } - markDirty(); + @Override + public ItemStack take(ItemStack stack, int flags) { + ItemStack result = getStorage().take(stack, flags); - return result; - } + markDirty(); - @Override - public boolean canPush(ItemStack stack) - { - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); - } + return result; + } - @Override - public int getCompare() - { - return compare; - } + @Override + public boolean canPush(ItemStack stack) { + return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); + } - @Override - public void setCompare(int compare) - { - markDirty(); + @Override + public int getCompare() { + return compare; + } - this.compare = compare; - } + @Override + public void setCompare(int compare) { + markDirty(); - @Override - public boolean isWhitelist() - { - return mode == 0; - } + this.compare = compare; + } - @Override - public boolean isBlacklist() - { - return mode == 1; - } + @Override + public boolean isWhitelist() { + return mode == 0; + } - @Override - public void setToWhitelist() - { - markDirty(); + @Override + public boolean isBlacklist() { + return mode == 1; + } - this.mode = 0; - } + @Override + public void setToWhitelist() { + markDirty(); - @Override - public void setToBlacklist() - { - markDirty(); + this.mode = 0; + } - this.mode = 1; - } + @Override + public void setToBlacklist() { + markDirty(); - @Override - public String getName() - { - return "block.refinedstorage:storage." + getType().getId() + ".name"; - } + this.mode = 1; + } - @Override - public IInventory getInventory() - { - return inventory; - } + @Override + public String getName() { + return "block.refinedstorage:storage." + getType().getId() + ".name"; + } - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } + @Override + public IInventory getInventory() { + return inventory; + } - @Override - public ICompareSetting getCompareSetting() - { - return this; - } + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } - @Override - public IModeSetting getModeSetting() - { - return this; - } + @Override + public ICompareSetting getCompareSetting() { + return this; + } - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } + @Override + public IModeSetting getModeSetting() { + return this; + } - public NBTStorage getStorage() - { - return new NBTStorage(tag, getCapacity(), priority); - } + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } - public NBTTagCompound getStorageTag() - { - return tag; - } + public NBTStorage getStorage() { + return new NBTStorage(tag, getCapacity(), priority); + } - public void setStorageTag(NBTTagCompound tag) - { - markDirty(); + public NBTTagCompound getStorageTag() { + return tag; + } - this.tag = tag; - } + public void setStorageTag(NBTTagCompound tag) { + markDirty(); - @Override - public int getPriority() - { - return priority; - } + this.tag = tag; + } - public void setPriority(int priority) - { - markDirty(); + @Override + public int getPriority() { + return priority; + } - this.priority = priority; - } + public void setPriority(int priority) { + markDirty(); - @Override - public int getStored() - { - return stored; - } + this.priority = priority; + } - public int getStoredScaled(int scale) - { - if (getType() == EnumStorageType.TYPE_CREATIVE) - { - return 0; - } + @Override + public int getStored() { + return stored; + } - return (int) ((float) getStored() / (float) getCapacity() * (float) scale); - } + public int getStoredScaled(int scale) { + if (getType() == EnumStorageType.TYPE_CREATIVE) { + return 0; + } - @Override - public int getCapacity() - { - return getType().getCapacity(); - } + return (int) ((float) getStored() / (float) getCapacity() * (float) scale); + } + + @Override + public int getCapacity() { + return getType().getCapacity(); + } } diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java old mode 100644 new mode 100755 index 55e0ced12..82c1a68a5 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -11,267 +11,225 @@ import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemWirelessGrid; import refinedstorage.util.InventoryUtils; -public class TileWirelessTransmitter extends TileMachine implements IInventory -{ - public static final int TOTAL_PROGRESS = 10000; +public class TileWirelessTransmitter extends TileMachine implements IInventory { + public static final int TOTAL_PROGRESS = 10000; - public static final String NBT_WORKING = "Working"; - public static final String NBT_PROGRESS = "Progress"; + public static final String NBT_WORKING = "Working"; + public static final String NBT_PROGRESS = "Progress"; - private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3); + private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3); - private boolean working = false; - private int progress = 0; + private boolean working = false; + private int progress = 0; - @Override - public int getEnergyUsage() - { - return 3; - } + @Override + public int getEnergyUsage() { + return 3; + } - @Override - public void updateMachine() - { - if (working) - { - progress++; + @Override + public void updateMachine() { + if (working) { + progress++; - if (progress == TOTAL_PROGRESS) - { - reset(); - } - } - else if (inventory.getStackInSlot(0) != null) - { - inventory.decrStackSize(0, 1); + if (progress == TOTAL_PROGRESS) { + reset(); + } + } else if (inventory.getStackInSlot(0) != null) { + inventory.decrStackSize(0, 1); - progress = 0; - working = true; + progress = 0; + working = true; - markDirty(); - } + markDirty(); + } - if (inventory.getStackInSlot(1) != null) - { - ItemStack slot = inventory.getStackInSlot(1); + if (inventory.getStackInSlot(1) != null) { + ItemStack slot = inventory.getStackInSlot(1); - slot.setTagCompound(new NBTTagCompound()); + slot.setTagCompound(new NBTTagCompound()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_X, pos.getX()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Y, pos.getY()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Z, pos.getZ()); + slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_X, pos.getX()); + slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Y, pos.getY()); + slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Z, pos.getZ()); - inventory.setInventorySlotContents(2, slot); - inventory.setInventorySlotContents(1, null); - } - } + inventory.setInventorySlotContents(2, slot); + inventory.setInventorySlotContents(1, null); + } + } - public void reset() - { - progress = 0; - working = false; + public void reset() { + progress = 0; + working = false; - markDirty(); - } + markDirty(); + } - @Override - public void onDisconnected() - { - super.onDisconnected(); + @Override + public void onDisconnected() { + super.onDisconnected(); - reset(); - } + reset(); + } - public boolean isWorking() - { - return working; - } + public boolean isWorking() { + return working; + } - public int getProgress() - { - return progress; - } + public int getProgress() { + return progress; + } - public TileGrid getGrid(EnumGridType type) - { - for (TileMachine machine : getController().getMachines()) - { - if (worldObj.getTileEntity(machine.getPos()) != null) - { - if (machine instanceof TileGrid) - { - TileGrid grid = (TileGrid) machine; + public TileGrid getGrid(EnumGridType type) { + for (TileMachine machine : getController().getMachines()) { + if (worldObj.getTileEntity(machine.getPos()) != null) { + if (machine instanceof TileGrid) { + TileGrid grid = (TileGrid) machine; - if (grid.getType() == type) - { - return grid; - } - } - } - } + if (grid.getType() == type) { + return grid; + } + } + } + } - return null; - } + return null; + } - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); + InventoryUtils.restoreInventory(this, 0, nbt); - if (nbt.hasKey(NBT_WORKING)) - { - working = nbt.getBoolean(NBT_WORKING); - } + if (nbt.hasKey(NBT_WORKING)) { + working = nbt.getBoolean(NBT_WORKING); + } - if (nbt.hasKey(NBT_PROGRESS)) - { - progress = nbt.getInteger(NBT_PROGRESS); - } - } + if (nbt.hasKey(NBT_PROGRESS)) { + progress = nbt.getInteger(NBT_PROGRESS); + } + } - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); + InventoryUtils.saveInventory(this, 0, nbt); - nbt.setBoolean(NBT_WORKING, working); - nbt.setInteger(NBT_PROGRESS, progress); - } + nbt.setBoolean(NBT_WORKING, working); + nbt.setInteger(NBT_PROGRESS, progress); + } - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); - boolean lastWorking = working; + boolean lastWorking = working; - working = buf.readBoolean(); - progress = buf.readInt(); + working = buf.readBoolean(); + progress = buf.readInt(); - if (lastWorking != working) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } + if (lastWorking != working) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); - buf.writeBoolean(working); - buf.writeInt(progress); - } + buf.writeBoolean(working); + buf.writeInt(progress); + } - @Override - public IInventory getDroppedInventory() - { - return inventory; - } + @Override + public IInventory getDroppedInventory() { + return inventory; + } - @Override - public int getSizeInventory() - { - return inventory.getSizeInventory(); - } + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory.getStackInSlot(slot); - } + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } - @Override - public ItemStack decrStackSize(int slot, int count) - { - return inventory.decrStackSize(slot, count); - } + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } - @Override - public ItemStack removeStackFromSlot(int slot) - { - return inventory.removeStackFromSlot(slot); - } + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.setInventorySlotContents(slot, stack); - } + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } - @Override - public int getInventoryStackLimit() - { - return inventory.getInventoryStackLimit(); - } + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return inventory.isUseableByPlayer(player); - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return inventory.isItemValidForSlot(slot, stack); - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } - @Override - public void openInventory(EntityPlayer player) - { - inventory.openInventory(player); - } + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } - @Override - public void closeInventory(EntityPlayer player) - { - inventory.closeInventory(player); - } + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } - @Override - public int getField(int id) - { - return inventory.getField(id); - } + @Override + public int getField(int id) { + return inventory.getField(id); + } - @Override - public void setField(int id, int value) - { - inventory.setField(id, value); - } + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } - @Override - public int getFieldCount() - { - return inventory.getFieldCount(); - } + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } - @Override - public void clear() - { - inventory.clear(); - } + @Override + public void clear() { + inventory.clear(); + } - @Override - public String getName() - { - return inventory.getName(); - } + @Override + public String getName() { + return inventory.getName(); + } - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } } diff --git a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java old mode 100644 new mode 100755 index 1437d068b..7c9177eec --- a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java +++ b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java @@ -2,11 +2,10 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface ICompareSetting -{ - public int getCompare(); +public interface ICompareSetting { + public int getCompare(); - public void setCompare(int compare); + public void setCompare(int compare); - public BlockPos getMachinePos(); + public BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IModeSetting.java b/src/main/java/refinedstorage/tile/settings/IModeSetting.java old mode 100644 new mode 100755 index 75cc34ca3..f708d567c --- a/src/main/java/refinedstorage/tile/settings/IModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IModeSetting.java @@ -2,15 +2,14 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface IModeSetting -{ - public boolean isWhitelist(); +public interface IModeSetting { + public boolean isWhitelist(); - public boolean isBlacklist(); + public boolean isBlacklist(); - public void setToWhitelist(); + public void setToWhitelist(); - public void setToBlacklist(); + public void setToBlacklist(); - public BlockPos getMachinePos(); + public BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java old mode 100644 new mode 100755 index b774eada5..d7eec1375 --- a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java @@ -2,11 +2,10 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; -public interface IRedstoneModeSetting -{ - public RedstoneMode getRedstoneMode(); +public interface IRedstoneModeSetting { + public RedstoneMode getRedstoneMode(); - public void setRedstoneMode(RedstoneMode mode); + public void setRedstoneMode(RedstoneMode mode); - public BlockPos getMachinePos(); + public BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java b/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java old mode 100644 new mode 100755 index 49a085915..a1936fcef --- a/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java +++ b/src/main/java/refinedstorage/tile/settings/ModeSettingUtils.java @@ -4,46 +4,36 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import refinedstorage.util.InventoryUtils; -public class ModeSettingUtils -{ - public static boolean doesNotViolateMode(IInventory inventory, IModeSetting mode, int compare, ItemStack stack) - { - if (mode.isWhitelist()) - { - int slots = 0; +public class ModeSettingUtils { + public static boolean doesNotViolateMode(IInventory inventory, IModeSetting mode, int compare, ItemStack stack) { + if (mode.isWhitelist()) { + int slots = 0; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - slots++; + if (slot != null) { + slots++; - if (InventoryUtils.compareStack(slot, stack, compare)) - { - return true; - } - } - } + if (InventoryUtils.compareStack(slot, stack, compare)) { + return true; + } + } + } - return slots == 0; - } - else if (mode.isBlacklist()) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + return slots == 0; + } else if (mode.isBlacklist()) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) - { - return false; - } - } + if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) { + return false; + } + } - return true; - } + return true; + } - return false; - } + return false; + } } diff --git a/src/main/java/refinedstorage/tile/settings/RedstoneMode.java b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java old mode 100644 new mode 100755 index 3d9bf9556..c2fdce468 --- a/src/main/java/refinedstorage/tile/settings/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java @@ -3,58 +3,49 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public enum RedstoneMode -{ - IGNORE(0), - HIGH(1), - LOW(2); +public enum RedstoneMode { + IGNORE(0), + HIGH(1), + LOW(2); - public static final String NBT = "RedstoneMode"; + public static final String NBT = "RedstoneMode"; - public final int id; + public final int id; - RedstoneMode(int id) - { - this.id = id; - } + RedstoneMode(int id) { + this.id = id; + } - public RedstoneMode next() - { - RedstoneMode next = getById(id + 1); + public RedstoneMode next() { + RedstoneMode next = getById(id + 1); - if (next == null) - { - return getById(0); - } + if (next == null) { + return getById(0); + } - return next; - } + return next; + } - public boolean isEnabled(World world, BlockPos pos) - { - switch (this) - { - case IGNORE: - return true; - case HIGH: - return world.isBlockPowered(pos); - case LOW: - return !world.isBlockPowered(pos); - } + public boolean isEnabled(World world, BlockPos pos) { + switch (this) { + case IGNORE: + return true; + case HIGH: + return world.isBlockPowered(pos); + case LOW: + return !world.isBlockPowered(pos); + } - return false; - } + return false; + } - public static RedstoneMode getById(int id) - { - for (RedstoneMode control : values()) - { - if (control.id == id) - { - return control; - } - } + public static RedstoneMode getById(int id) { + for (RedstoneMode control : values()) { + if (control.id == id) { + return control; + } + } - return null; - } + return null; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java old mode 100644 new mode 100755 index 8122c8bd8..9a1007efd --- a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java +++ b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java @@ -2,11 +2,10 @@ package refinedstorage.tile.solderer; import net.minecraft.item.ItemStack; -public interface ISoldererRecipe -{ - public ItemStack getRow(int row); +public interface ISoldererRecipe { + public ItemStack getRow(int row); - public ItemStack getResult(); + public ItemStack getResult(); - public int getDuration(); + public int getDuration(); } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java old mode 100644 new mode 100755 index fae2db28e..6c0317604 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java @@ -7,36 +7,27 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.block.EnumGridType; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeCraftingGrid implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, 0); - } - else if (row == 2) - { - return new ItemStack(Blocks.crafting_table); - } +public class SoldererRecipeCraftingGrid implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.GRID, 1, 0); + } else if (row == 2) { + return new ItemStack(Blocks.crafting_table); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()); + } - @Override - public int getDuration() - { - return 500; - } + @Override + public int getDuration() { + return 500; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java old mode 100644 new mode 100755 index 759119e3c..0e019bd05 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java @@ -6,36 +6,27 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeDrive implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); - } - else if (row == 2) - { - return new ItemStack(Blocks.chest); - } +public class SoldererRecipeDrive implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); + } else if (row == 2) { + return new ItemStack(Blocks.chest); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.DRIVE); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.DRIVE); + } - @Override - public int getDuration() - { - return 500; - } + @Override + public int getDuration() { + return 500; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java old mode 100644 new mode 100755 index ec0f42bc7..c25cb6282 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java @@ -5,36 +5,27 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeInterface implements ISoldererRecipe -{ - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageBlocks.IMPORTER); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageBlocks.EXPORTER); - } +public class SoldererRecipeInterface implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageBlocks.IMPORTER); + } else if (row == 1) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC); + } else if (row == 2) { + return new ItemStack(RefinedStorageBlocks.EXPORTER); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageBlocks.INTERFACE); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.INTERFACE); + } - @Override - public int getDuration() - { - return 200; - } + @Override + public int getDuration() { + return 200; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java old mode 100644 new mode 100755 index 165dd6af5..31b4d72e8 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java @@ -5,57 +5,49 @@ import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipePrintedProcessor implements ISoldererRecipe -{ - private int type; +public class SoldererRecipePrintedProcessor implements ISoldererRecipe { + private int type; - public SoldererRecipePrintedProcessor(int type) - { - this.type = type; - } + public SoldererRecipePrintedProcessor(int type) { + this.type = type; + } - @Override - public ItemStack getRow(int row) - { - if (row == 1) - { - switch (type) - { - case ItemProcessor.TYPE_PRINTED_BASIC: - return new ItemStack(Items.iron_ingot); - case ItemProcessor.TYPE_PRINTED_IMPROVED: - return new ItemStack(Items.gold_ingot); - case ItemProcessor.TYPE_PRINTED_ADVANCED: - return new ItemStack(Items.diamond); - case ItemProcessor.TYPE_PRINTED_SILICON: - return new ItemStack(RefinedStorageItems.SILICON); - } - } + @Override + public ItemStack getRow(int row) { + if (row == 1) { + switch (type) { + case ItemProcessor.TYPE_PRINTED_BASIC: + return new ItemStack(Items.iron_ingot); + case ItemProcessor.TYPE_PRINTED_IMPROVED: + return new ItemStack(Items.gold_ingot); + case ItemProcessor.TYPE_PRINTED_ADVANCED: + return new ItemStack(Items.diamond); + case ItemProcessor.TYPE_PRINTED_SILICON: + return new ItemStack(RefinedStorageItems.SILICON); + } + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); + } - @Override - public int getDuration() - { - switch (type) - { - case ItemProcessor.TYPE_PRINTED_BASIC: - return 100; - case ItemProcessor.TYPE_PRINTED_IMPROVED: - return 150; - case ItemProcessor.TYPE_PRINTED_ADVANCED: - return 200; - case ItemProcessor.TYPE_PRINTED_SILICON: - return 90; - } + @Override + public int getDuration() { + switch (type) { + case ItemProcessor.TYPE_PRINTED_BASIC: + return 100; + case ItemProcessor.TYPE_PRINTED_IMPROVED: + return 150; + case ItemProcessor.TYPE_PRINTED_ADVANCED: + return 200; + case ItemProcessor.TYPE_PRINTED_SILICON: + return 90; + } - return 0; - } + return 0; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java old mode 100644 new mode 100755 index 4ec2e21b5..ec4bd99bc --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java @@ -5,61 +5,49 @@ import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeProcessor implements ISoldererRecipe -{ - private int type; +public class SoldererRecipeProcessor implements ISoldererRecipe { + private int type; - public SoldererRecipeProcessor(int type) - { - this.type = type; - } + public SoldererRecipeProcessor(int type) { + this.type = type; + } - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - switch (type) - { - case ItemProcessor.TYPE_BASIC: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); - case ItemProcessor.TYPE_IMPROVED: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); - case ItemProcessor.TYPE_ADVANCED: - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); - } - } - else if (row == 1) - { - return new ItemStack(Items.redstone); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); - } + @Override + public ItemStack getRow(int row) { + if (row == 0) { + switch (type) { + case ItemProcessor.TYPE_BASIC: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_BASIC); + case ItemProcessor.TYPE_IMPROVED: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_IMPROVED); + case ItemProcessor.TYPE_ADVANCED: + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_ADVANCED); + } + } else if (row == 1) { + return new ItemStack(Items.redstone); + } else if (row == 2) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_PRINTED_SILICON); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, type); + } - @Override - public int getDuration() - { - switch (type) - { - case ItemProcessor.TYPE_BASIC: - return 250; - case ItemProcessor.TYPE_IMPROVED: - return 300; - case ItemProcessor.TYPE_ADVANCED: - return 350; - } + @Override + public int getDuration() { + switch (type) { + case ItemProcessor.TYPE_BASIC: + return 250; + case ItemProcessor.TYPE_IMPROVED: + return 300; + case ItemProcessor.TYPE_ADVANCED: + return 350; + } - return 0; - } + return 0; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java old mode 100644 new mode 100755 index ab8562fdb..4312366c0 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java @@ -7,45 +7,35 @@ import refinedstorage.block.EnumStorageType; import refinedstorage.item.ItemBlockStorage; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeStorage implements ISoldererRecipe -{ - private EnumStorageType type; - private int storagePart; +public class SoldererRecipeStorage implements ISoldererRecipe { + private EnumStorageType type; + private int storagePart; - public SoldererRecipeStorage(EnumStorageType type, int storagePart) - { - this.type = type; - this.storagePart = storagePart; - } + public SoldererRecipeStorage(EnumStorageType type, int storagePart) { + this.type = type; + this.storagePart = storagePart; + } - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.STORAGE_PART, 1, storagePart); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); + } else if (row == 2) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.STORAGE, 1, type.getId())); - } + @Override + public ItemStack getResult() { + return ItemBlockStorage.initNBT(new ItemStack(RefinedStorageBlocks.STORAGE, 1, type.getId())); + } - @Override - public int getDuration() - { - return 200; - } + @Override + public int getDuration() { + return 200; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java old mode 100644 new mode 100755 index 6ffd916ff..300af3529 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java @@ -5,43 +5,33 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeWirelessGrid implements ISoldererRecipe -{ - private int type; +public class SoldererRecipeWirelessGrid implements ISoldererRecipe { + private int type; - public SoldererRecipeWirelessGrid(int type) - { - this.type = type; - } + public SoldererRecipeWirelessGrid(int type) { + this.type = type; + } - @Override - public ItemStack getRow(int row) - { - if (row == 0) - { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE); - } - else if (row == 1) - { - return new ItemStack(RefinedStorageBlocks.GRID, 1, type); - } - else if (row == 2) - { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.GRID, 1, type); + } else if (row == 2) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } - return null; - } + return null; + } - @Override - public ItemStack getResult() - { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, type); - } + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, type); + } - @Override - public int getDuration() - { - return 1000; - } + @Override + public int getDuration() { + return 1000; + } } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java old mode 100644 new mode 100755 index 4855174cd..79c2cc4d0 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java @@ -1,61 +1,50 @@ package refinedstorage.tile.solderer; -import java.util.ArrayList; -import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import refinedstorage.util.InventoryUtils; -public class SoldererRegistry -{ - public static List recipes = new ArrayList(); +import java.util.ArrayList; +import java.util.List; - public static void addRecipe(ISoldererRecipe recipe) - { - recipes.add(recipe); - } +public class SoldererRegistry { + public static List recipes = new ArrayList(); - public static ISoldererRecipe getRecipe(IInventory inventory) - { - for (ISoldererRecipe recipe : recipes) - { - boolean ok = true; + public static void addRecipe(ISoldererRecipe recipe) { + recipes.add(recipe); + } - for (int i = 0; i < 3; ++i) - { - if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) - { - ok = false; - } + public static ISoldererRecipe getRecipe(IInventory inventory) { + for (ISoldererRecipe recipe : recipes) { + boolean ok = true; - if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) - { - if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) - { - ok = false; - } - } - } + for (int i = 0; i < 3; ++i) { + if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) { + ok = false; + } - if (ok) - { - return recipe; - } - } + if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) { + if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) { + ok = false; + } + } + } - return null; - } + if (ok) { + return recipe; + } + } - public static ISoldererRecipe getRecipe(ItemStack result) - { - for (ISoldererRecipe recipe : recipes) - { - if (InventoryUtils.compareStack(result, recipe.getResult())) - { - return recipe; - } - } + return null; + } - return null; - } + public static ISoldererRecipe getRecipe(ItemStack result) { + for (ISoldererRecipe recipe : recipes) { + if (InventoryUtils.compareStack(result, recipe.getResult())) { + return recipe; + } + } + + return null; + } } diff --git a/src/main/java/refinedstorage/util/InventoryUtils.java b/src/main/java/refinedstorage/util/InventoryUtils.java old mode 100644 new mode 100755 index f5263cd01..4008b3b9d --- a/src/main/java/refinedstorage/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/util/InventoryUtils.java @@ -8,268 +8,218 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; -public class InventoryUtils -{ - public static final String NBT_INVENTORY = "Inventory_%d"; - public static final String NBT_SLOT = "Slot"; +public class InventoryUtils { + public static final String NBT_INVENTORY = "Inventory_%d"; + public static final String NBT_SLOT = "Slot"; - public static final int COMPARE_DAMAGE = 1; - public static final int COMPARE_NBT = 2; - public static final int COMPARE_QUANTITY = 4; + public static final int COMPARE_DAMAGE = 1; + public static final int COMPARE_NBT = 2; + public static final int COMPARE_QUANTITY = 4; - public static void saveInventory(IInventory inventory, int id, NBTTagCompound nbt) - { - NBTTagList tagList = new NBTTagList(); + public static void saveInventory(IInventory inventory, int id, NBTTagCompound nbt) { + NBTTagList tagList = new NBTTagList(); - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (inventory.getStackInSlot(i) != null) - { - NBTTagCompound compoundTag = new NBTTagCompound(); + for (int i = 0; i < inventory.getSizeInventory(); i++) { + if (inventory.getStackInSlot(i) != null) { + NBTTagCompound compoundTag = new NBTTagCompound(); - compoundTag.setInteger(NBT_SLOT, i); + compoundTag.setInteger(NBT_SLOT, i); - inventory.getStackInSlot(i).writeToNBT(compoundTag); + inventory.getStackInSlot(i).writeToNBT(compoundTag); - tagList.appendTag(compoundTag); - } - } + tagList.appendTag(compoundTag); + } + } - nbt.setTag(String.format(NBT_INVENTORY, id), tagList); - } + nbt.setTag(String.format(NBT_INVENTORY, id), tagList); + } - public static void restoreInventory(IInventory inventory, int id, NBTTagCompound nbt) - { - String name = String.format(NBT_INVENTORY, id); + public static void restoreInventory(IInventory inventory, int id, NBTTagCompound nbt) { + String name = String.format(NBT_INVENTORY, id); - if (nbt.hasKey(name)) - { - NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); + if (nbt.hasKey(name)) { + NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < tagList.tagCount(); i++) - { - int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); + for (int i = 0; i < tagList.tagCount(); i++) { + int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT); - ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); + ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); - inventory.setInventorySlotContents(slot, stack); - } - } - } + inventory.setInventorySlotContents(slot, stack); + } + } + } - public static void dropInventory(World world, IInventory inventory, int x, int y, int z) - { - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack stack = inventory.getStackInSlot(i); + public static void dropInventory(World world, IInventory inventory, int x, int y, int z) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack stack = inventory.getStackInSlot(i); - if (stack != null) - { - dropStack(world, stack, x, y, z); - } - } - } + if (stack != null) { + dropStack(world, stack, x, y, z); + } + } + } - public static void dropStack(World world, ItemStack stack, int x, int y, int z) - { - float xo = world.rand.nextFloat() * 0.8F + 0.1F; - float yo = world.rand.nextFloat() * 0.8F + 0.1F; - float zo = world.rand.nextFloat() * 0.8F + 0.1F; + public static void dropStack(World world, ItemStack stack, int x, int y, int z) { + float xo = world.rand.nextFloat() * 0.8F + 0.1F; + float yo = world.rand.nextFloat() * 0.8F + 0.1F; + float zo = world.rand.nextFloat() * 0.8F + 0.1F; - while (stack.stackSize > 0) - { - int amount = world.rand.nextInt(21) + 10; + while (stack.stackSize > 0) { + int amount = world.rand.nextInt(21) + 10; - if (amount > stack.stackSize) - { - amount = stack.stackSize; - } + if (amount > stack.stackSize) { + amount = stack.stackSize; + } - stack.stackSize -= amount; + stack.stackSize -= amount; - EntityItem entity = new EntityItem(world, (float) x + xo, (float) y + yo, (float) z + zo, new ItemStack(stack.getItem(), amount, stack.getItemDamage())); + EntityItem entity = new EntityItem(world, (float) x + xo, (float) y + yo, (float) z + zo, new ItemStack(stack.getItem(), amount, stack.getItemDamage())); - entity.motionX = (float) world.rand.nextGaussian() * 0.05F; - entity.motionY = (float) world.rand.nextGaussian() * 0.05F + 0.2F; - entity.motionZ = (float) world.rand.nextGaussian() * 0.05F; + entity.motionX = (float) world.rand.nextGaussian() * 0.05F; + entity.motionY = (float) world.rand.nextGaussian() * 0.05F + 0.2F; + entity.motionZ = (float) world.rand.nextGaussian() * 0.05F; - if (stack.hasTagCompound()) - { - entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); - } + if (stack.hasTagCompound()) { + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } - world.spawnEntityInWorld(entity); - } - } + world.spawnEntityInWorld(entity); + } + } - public static void pushToInventorySlot(IInventory inventory, int i, ItemStack stack) - { - ItemStack slot = inventory.getStackInSlot(i); + public static void pushToInventorySlot(IInventory inventory, int i, ItemStack stack) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - inventory.setInventorySlotContents(i, stack); - } - else if (compareStackNoQuantity(slot, stack)) - { - slot.stackSize += stack.stackSize; - } - } + if (slot == null) { + inventory.setInventorySlotContents(i, stack); + } else if (compareStackNoQuantity(slot, stack)) { + slot.stackSize += stack.stackSize; + } + } - public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) - { - ItemStack slot = inventory.getStackInSlot(i); + public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - return true; - } + if (slot == null) { + return true; + } - if (!compareStackNoQuantity(slot, stack)) - { - return false; - } + if (!compareStackNoQuantity(slot, stack)) { + return false; + } - return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); - } + return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); + } - public static void pushToInventory(IInventory inventory, ItemStack stack) - { - int toGo = stack.stackSize; + public static void pushToInventory(IInventory inventory, ItemStack stack) { + int toGo = stack.stackSize; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - inventory.setInventorySlotContents(i, stack); + if (slot == null) { + inventory.setInventorySlotContents(i, stack); - return; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; + return; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } - slot.stackSize += toAdd; + slot.stackSize += toAdd; - toGo -= toAdd; + toGo -= toAdd; - if (toGo == 0) - { - return; - } - } - } - } + if (toGo == 0) { + return; + } + } + } + } - public static boolean canPushToInventory(IInventory inventory, ItemStack stack) - { - int toGo = stack.stackSize; + public static boolean canPushToInventory(IInventory inventory, ItemStack stack) { + int toGo = stack.stackSize; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - // @TODO: Test this better - if (!inventory.isItemValidForSlot(i, stack)) - { - continue; - } + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + // @TODO: Test this better + if (!inventory.isItemValidForSlot(i, stack)) { + continue; + } - ItemStack slot = inventory.getStackInSlot(i); + ItemStack slot = inventory.getStackInSlot(i); - if (slot == null) - { - return true; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; + if (slot == null) { + return true; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } - toGo -= toAdd; + toGo -= toAdd; - if (toGo == 0) - { - break; - } - } - } + if (toGo == 0) { + break; + } + } + } - return toGo == 0; - } + return toGo == 0; + } - public static int getInventoryItems(IInventory inventory) - { - int size = 0; + public static int getInventoryItems(IInventory inventory) { + int size = 0; - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); - if (slot != null) - { - size += slot.stackSize; - } - } + if (slot != null) { + size += slot.stackSize; + } + } - return size; - } + return size; + } - public static boolean compareStack(ItemStack first, ItemStack second) - { - return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE | COMPARE_QUANTITY); - } + public static boolean compareStack(ItemStack first, ItemStack second) { + return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE | COMPARE_QUANTITY); + } - public static boolean compareStack(ItemStack first, ItemStack second, int flags) - { - if (first == null && second == null) - { - return true; - } + public static boolean compareStack(ItemStack first, ItemStack second, int flags) { + if (first == null && second == null) { + return true; + } - if ((first == null && second != null) || (first != null && second == null)) - { - return false; - } + if ((first == null && second != null) || (first != null && second == null)) { + return false; + } - if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) - { - if (first.getItemDamage() != second.getItemDamage()) - { - return false; - } - } + if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) { + if (first.getItemDamage() != second.getItemDamage()) { + return false; + } + } - if ((flags & COMPARE_NBT) == COMPARE_NBT) - { - if (first.hasTagCompound() && !first.getTagCompound().equals(second.getTagCompound())) - { - return false; - } - } + if ((flags & COMPARE_NBT) == COMPARE_NBT) { + if (first.hasTagCompound() && !first.getTagCompound().equals(second.getTagCompound())) { + return false; + } + } - if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) - { - if (first.stackSize != second.stackSize) - { - return false; - } - } + if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) { + if (first.stackSize != second.stackSize) { + return false; + } + } - return first.getItem() == second.getItem(); - } + return first.getItem() == second.getItem(); + } - public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) - { - return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); - } + public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) { + return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); + } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/drive.json b/src/main/resources/assets/refinedstorage/blockstates/drive.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay.json b/src/main/resources/assets/refinedstorage/blockstates/relay.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage.json b/src/main/resources/assets/refinedstorage/blockstates/storage.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json b/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/src/main/resources/assets/refinedstorage/models/item/construction_core.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/silicon.json b/src/main/resources/assets/refinedstorage/models/item/silicon.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_unpowered.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/constructor.png b/src/main/resources/assets/refinedstorage/textures/gui/constructor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/controller.png b/src/main/resources/assets/refinedstorage/textures/gui/controller.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_grid.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/destructor.png b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/drive.png b/src/main/resources/assets/refinedstorage/textures/gui/drive.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/interface.png b/src/main/resources/assets/refinedstorage/textures/gui/interface.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/relay.png b/src/main/resources/assets/refinedstorage/textures/gui/relay.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/solderer.png b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/storage.png b/src/main/resources/assets/refinedstorage/textures/gui/storage.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png b/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png b/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png old mode 100644 new mode 100755 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info old mode 100644 new mode 100755 From 06474a833d4101ff5eb5e1089d7137394e9b881d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 18:46:29 +0100 Subject: [PATCH 02/76] Fix outdated wireless transmitter GUI --- .../textures/gui/wireless_transmitter.png | Bin 2174 -> 2112 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/gui/wireless_transmitter.png index bc0d15b6d2e6f7276f66eca9d91446ab32f24acd..b7acef20ad5394bacdaf555c54b2683c0f2be965 100755 GIT binary patch literal 2112 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6e85q}58QK^dha$S)X} z=0`GM2>#Bl3XE;e0*}aI1_r*pAk66gd%{|vphSslL`iUdT1k0gQ7S`0VrE{6US4X6 zf{C7io@I`4ogc73S?1~D7*Y}U_EvY%Yy%P3!0R)P|Np!7eEBus$?5sT z*k*=U`R8)?|0?RWo)dgvSbF%z()V?XE>xymS2*y8t0TY8roHK$@@_W9Wtw&0Y?mp< zG0kK6eAPalt#*$@iQG+74g}6asxnKA6e|DaapYG2Cs|hdz z<&1_cU)I}q&)<0T(xmGD@iFy<`Tr)(V))qiDeUCyM>ihjYsJ@}>}Py)d|GLu3`<4q zZQ%#0AG;aPJl|_~u3RD^{+?(;^#3G=(~U*S6hZJ7pqS%U&ksSfA0M2 zYd8HEb^af?%CPPEFNV|0^*986Upu?`Z}G>qPlJCw$YLmr(dSCHW?b+VXsEh=L+bIJ zeaso37cs0p^pcM`LwlE)L(Pw0CA$_g-13O!esGzODdU_a)1I$y84iEame60ixAj!S zpV#^;IWD+?Jkz&30^})%sJ)FKO169>h+^1M#T?3VL4VO3-dWZ5dzPCuz~SSxBTYnihTFt_ZQ~fV%T+Qn^xSJN?=}t0+`ug?yI{e zHMcG|YIwK%P3WHOi+7f1_~$ajW=4zZKigvq(*buKSm5isCsS?(OD^aI@qmVfG2E@b zySk!29AaP9_M5AIv`yR24%2<1P@EgaW>|3V?wz1&E#@tP3=9>_cUCjpxwPwSh@8T| zjJIODt}=LpJ8J8)$8O^C-X_X0Ya8Q&OzGi4Ewi1!pK;~l12rZt3l4)q!_(EzWt~$( F69DW}x_STr literal 2174 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6kJ3IS^kL&+!4FCVjcXxLmJ9g~<|NlVQQ7{?;!#D(lAFrwbWt5U2 zzhGd3AIX3r_&d8QFseBVJR*x382I*qFykwyjR$~&5+$w?CBgY=CFO}lsSE{)nRz98 zd8s7|CVB>XW`BB;?*j{zC!Q{jAr*0NXLXm|G7w?OWUBk~pZ&6SWiGSo+QKErlG6R& zlujwSD4X));=_`?^KLzyC2{VsPt4PW`31Y?9VoH@%CRge7l);8L}+-UC$%@ zD%qTu%cA^Z^`2j~I<1=*H=M3`*Ir!pbu!o2jkDQUpI9rz{jq3g1#^0m_k52%W|zn4 z&sh2OdFq9uXBXI&U0%?T*z;`n#%^l`y(`D_X4MG$$TO_`xnt9xdI$OK|BHg;cV`AT zL<%%8uqY@@{rA;l&v7wl)$o6@G5-rx?UyWT_~Ej1@snLQ!v35)^|}4ejE2&@-D1aL z{(KG=KhJvSTAe-P#oy@@^!EuB1pi53D!Tvqqm_`s+J^m{5vTXhZ^-2I`CG4>u(IBO z@$!*JCFS$;(zNEiW7x}Gqnohqe;w1ZZ^GFh|G4z~)LTt!_+dK#`ReeKOnG(xv=XYC z7IQ|N`^pNGS7Rtp$ap*asj9A;sgrP+>w@c}2&R3f-55`uk>-lH5%On0 z_lxE06YflK4zH_NvW+2kuWpaKv?Ev%3sB3fazk)Hf;2NQ{rlr}>Y|$#_l13@y^ijceR^uy z#9K^TE{SRBJ*!m)8wd(?htGO!AWJ~{IUF4J&YcsaJe4)$e(KUk_xg%bFMH%NMrCq~ zihtfG2vGuZNToP4*b1<|1^4{?R!%&{bPMd}XR$qz4d3Fzwcfqg3ODP$BDTPPc59b> z#&0*cB@NGFdEjO>G*s>0xfJNk3}zOE1JMWEMH!ceY?nO6-64N9uQ8aHF;jHQA(NMr qLNsoQaRl6IVpys>Jg8Ykd;hUbVH5GOWhi0-)d`-ielF{r5}E+J647e_ From 578e6da0a2181482abb389fb0f3581075dd11711 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 18:56:14 +0100 Subject: [PATCH 03/76] Display tooltip for machine on controller --- src/main/java/refinedstorage/gui/GuiBase.java | 4 +++- src/main/java/refinedstorage/gui/GuiController.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 25c02d4c9..6fcdc1e16 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -137,7 +137,7 @@ public abstract class GuiBase extends GuiContainer { } public void drawItem(int x, int y, ItemStack stack) { - drawItem(x, y, stack, false, null); + drawItem(x, y, stack, false); } public void drawItem(int x, int y, ItemStack stack, boolean withOverlay) { @@ -185,7 +185,9 @@ public abstract class GuiBase extends GuiContainer { } public void drawTooltip(int x, int y, ItemStack stack) { + GL11.glDisable(GL11.GL_LIGHTING); renderToolTip(stack, x, y); + GL11.glEnable(GL11.GL_LIGHTING); } public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) { diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 62f7548bc..057f4a2e8 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -70,6 +70,10 @@ public class GuiController extends GuiBase { ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); + if (inBounds(x, y, 16, 16, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, machineStack); + } + drawItem(x, y, machineStack); drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); } From 8151065bb1c17b57134dfccc0702c86429758a4c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 19:16:27 +0100 Subject: [PATCH 04/76] Fix tooltip --- src/main/java/refinedstorage/gui/GuiController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 057f4a2e8..bb579f6ff 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -62,6 +62,8 @@ public class GuiController extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); + ItemStack hoveringMachineStack = null; + for (int i = 0; i < 4; ++i) { if (slot < controller.getMachines().size()) { TileMachine machine = controller.getMachines().get(slot); @@ -71,7 +73,7 @@ public class GuiController extends GuiBase { ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); if (inBounds(x, y, 16, 16, mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, machineStack); + hoveringMachineStack = machineStack; } drawItem(x, y, machineStack); @@ -88,6 +90,10 @@ public class GuiController extends GuiBase { slot++; } + if (hoveringMachineStack != null) { + drawTooltip(mouseX, mouseY, hoveringMachineStack); + } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } From 36cca7a9c882da9ea2bff9ea9309df1a15268cab Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 19:17:44 +0100 Subject: [PATCH 05/76] Compatibility with drives from the previous version. --- src/main/java/refinedstorage/item/ItemStorageCell.java | 1 + src/main/java/refinedstorage/tile/TileDrive.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/refinedstorage/item/ItemStorageCell.java b/src/main/java/refinedstorage/item/ItemStorageCell.java index e649f6dad..610d84593 100755 --- a/src/main/java/refinedstorage/item/ItemStorageCell.java +++ b/src/main/java/refinedstorage/item/ItemStorageCell.java @@ -11,6 +11,7 @@ import refinedstorage.storage.NBTStorage; import java.util.List; +// @TODO: Rename to storage disk public class ItemStorageCell extends ItemBase { public static final int TYPE_1K = 0; public static final int TYPE_4K = 1; diff --git a/src/main/java/refinedstorage/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java index 66092166d..06cc95914 100755 --- a/src/main/java/refinedstorage/tile/TileDrive.java +++ b/src/main/java/refinedstorage/tile/TileDrive.java @@ -22,8 +22,8 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage public static final String NBT_COMPARE = "Compare"; public static final String NBT_MODE = "Mode"; - private InventorySimple filterInventory = new InventorySimple("filters", 9, this); private InventorySimple inventory = new InventorySimple("drive", 8, this); + private InventorySimple filterInventory = new InventorySimple("filters", 9, this); private int priority = 0; private int compare = 0; @@ -59,8 +59,8 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(filterInventory, 0, nbt); - InventoryUtils.restoreInventory(inventory, 1, nbt); + InventoryUtils.restoreInventory(inventory, 0, nbt); + InventoryUtils.restoreInventory(filterInventory, 1, nbt); if (nbt.hasKey(NBT_PRIORITY)) { priority = nbt.getInteger(NBT_PRIORITY); @@ -79,8 +79,8 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(filterInventory, 0, nbt); - InventoryUtils.saveInventory(inventory, 1, nbt); + InventoryUtils.saveInventory(inventory, 0, nbt); + InventoryUtils.saveInventory(filterInventory, 1, nbt); nbt.setInteger(NBT_PRIORITY, priority); nbt.setInteger(NBT_COMPARE, compare); From 44559fe063671398cf7430983d2bcf7511274b4d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 20:29:17 +0100 Subject: [PATCH 06/76] Rename storage cells to storage disks --- .../java/refinedstorage/RefinedStorage.java | 4 ++-- .../refinedstorage/RefinedStorageItems.java | 2 +- .../container/ContainerDrive.java | 4 ++-- ...mStorageCell.java => ItemStorageDisk.java} | 17 +++++++------- .../jei/PluginRefinedStorage.java | 4 ++-- .../refinedstorage/proxy/ClientProxy.java | 22 +++++++++--------- .../refinedstorage/proxy/CommonProxy.java | 14 +++++------ .../{CellStorage.java => DiskStorage.java} | 22 +++++++++--------- .../java/refinedstorage/tile/TileDrive.java | 8 +++---- .../assets/refinedstorage/lang/en_US.lang | 10 ++++---- .../assets/refinedstorage/lang/nl_NL.lang | 10 ++++---- .../models/item/16k_storage_cell.json | 6 ----- .../models/item/16k_storage_disk.json | 6 +++++ .../models/item/1k_storage_cell.json | 6 ----- ...storage_cell.json => 1k_storage_disk.json} | 2 +- ...lank_pattern.json => 4k_storage_disk.json} | 2 +- .../models/item/64k_storage_cell.json | 6 ----- .../models/item/64k_storage_disk.json | 6 +++++ .../models/item/creative_storage_cell.json | 6 ----- .../models/item/creative_storage_disk.json | 6 +++++ ..._storage_cell.png => 16k_storage_disk.png} | Bin ...k_storage_cell.png => 1k_storage_disk.png} | Bin ...k_storage_cell.png => 4k_storage_disk.png} | Bin ..._storage_cell.png => 64k_storage_disk.png} | Bin .../textures/items/blank_pattern.png | Bin 483 -> 0 bytes ...age_cell.png => creative_storage_disk.png} | Bin 26 files changed, 78 insertions(+), 85 deletions(-) rename src/main/java/refinedstorage/item/{ItemStorageCell.java => ItemStorageDisk.java} (72%) rename src/main/java/refinedstorage/storage/{CellStorage.java => DiskStorage.java} (56%) delete mode 100755 src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json create mode 100755 src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json delete mode 100755 src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json rename src/main/resources/assets/refinedstorage/models/item/{4k_storage_cell.json => 1k_storage_disk.json} (50%) rename src/main/resources/assets/refinedstorage/models/item/{blank_pattern.json => 4k_storage_disk.json} (50%) delete mode 100755 src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json create mode 100755 src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json delete mode 100755 src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json create mode 100755 src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json rename src/main/resources/assets/refinedstorage/textures/items/{16k_storage_cell.png => 16k_storage_disk.png} (100%) rename src/main/resources/assets/refinedstorage/textures/items/{1k_storage_cell.png => 1k_storage_disk.png} (100%) rename src/main/resources/assets/refinedstorage/textures/items/{4k_storage_cell.png => 4k_storage_disk.png} (100%) rename src/main/resources/assets/refinedstorage/textures/items/{64k_storage_cell.png => 64k_storage_disk.png} (100%) delete mode 100755 src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png rename src/main/resources/assets/refinedstorage/textures/items/{creative_storage_cell.png => creative_storage_disk.png} (100%) diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index ad54e8340..0a7bc91e2 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -12,7 +12,7 @@ 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.item.ItemStorageCell; +import refinedstorage.item.ItemStorageDisk; import refinedstorage.proxy.CommonProxy; @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION) @@ -25,7 +25,7 @@ public final class RefinedStorage { public static final CreativeTabs TAB = new CreativeTabs(ID) { @Override public ItemStack getIconItemStack() { - return new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K); + return new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_1K); } @Override diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java index cdc5128cc..39d5fc013 100755 --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -3,7 +3,7 @@ package refinedstorage; import refinedstorage.item.*; public final class RefinedStorageItems { - public static final ItemStorageCell STORAGE_CELL = new ItemStorageCell(); + public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk(); public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); public static final ItemWirelessGridPlate WIRELESS_GRID_PLATE = new ItemWirelessGridPlate(); public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); diff --git a/src/main/java/refinedstorage/container/ContainerDrive.java b/src/main/java/refinedstorage/container/ContainerDrive.java index a0dc7efd9..bb01836b5 100755 --- a/src/main/java/refinedstorage/container/ContainerDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDrive.java @@ -11,11 +11,11 @@ public class ContainerDrive extends ContainerStorage { super(player, drive.getInventory()); for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); + addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); } for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_CELL))); + addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); } } } diff --git a/src/main/java/refinedstorage/item/ItemStorageCell.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java similarity index 72% rename from src/main/java/refinedstorage/item/ItemStorageCell.java rename to src/main/java/refinedstorage/item/ItemStorageDisk.java index 610d84593..298b5c030 100755 --- a/src/main/java/refinedstorage/item/ItemStorageCell.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -6,21 +6,20 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; -import refinedstorage.storage.CellStorage; +import refinedstorage.storage.DiskStorage; import refinedstorage.storage.NBTStorage; import java.util.List; -// @TODO: Rename to storage disk -public class ItemStorageCell extends ItemBase { +public class ItemStorageDisk extends ItemBase { public static final int TYPE_1K = 0; public static final int TYPE_4K = 1; public static final int TYPE_16K = 2; public static final int TYPE_64K = 3; public static final int TYPE_CREATIVE = 4; - public ItemStorageCell() { - super("storage_cell"); + public ItemStorageDisk() { + super("storage_disk"); setMaxStackSize(1); setHasSubtypes(true); @@ -35,11 +34,11 @@ public class ItemStorageCell extends ItemBase { } @Override - public void addInformation(ItemStack cell, EntityPlayer player, List list, boolean b) { - if (CellStorage.getCapacity(cell) == -1) { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(cell.getTagCompound()))); + public void addInformation(ItemStack disk, EntityPlayer player, List list, boolean b) { + if (DiskStorage.getCapacity(disk) == -1) { + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored"), NBTStorage.getStored(disk.getTagCompound()))); } else { - list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell))); + list.add(String.format(I18n.translateToLocal("misc.refinedstorage:storage.stored_capacity"), NBTStorage.getStored(disk.getTagCompound()), DiskStorage.getCapacity(disk))); } } diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java index 382a3cce3..238d00bbd 100755 --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -6,7 +6,7 @@ import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.storage.CellStorage; +import refinedstorage.storage.DiskStorage; import refinedstorage.tile.TileStorage; @JEIPlugin @@ -20,7 +20,7 @@ public class PluginRefinedStorage extends BlankModPlugin { registry.addRecipes(SoldererRecipeMaker.getRecipes()); - registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); + registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(RefinedStorageItems.STORAGE_DISK, DiskStorage.NBT_ITEMS, DiskStorage.NBT_STORED); registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), TileStorage.NBT_STORAGE); } } diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 4835bd695..f5cd61d3f 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -22,12 +22,12 @@ public class ClientProxy extends CommonProxy { super.preInit(e); // Item Variants - ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_CELL, - new ResourceLocation("refinedstorage:1k_storage_cell"), - new ResourceLocation("refinedstorage:4k_storage_cell"), - new ResourceLocation("refinedstorage:16k_storage_cell"), - new ResourceLocation("refinedstorage:64k_storage_cell"), - new ResourceLocation("refinedstorage:creative_storage_cell") + ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_DISK, + new ResourceLocation("refinedstorage:1k_storage_disk"), + new ResourceLocation("refinedstorage:4k_storage_disk"), + new ResourceLocation("refinedstorage:16k_storage_disk"), + new ResourceLocation("refinedstorage:64k_storage_disk"), + new ResourceLocation("refinedstorage:creative_storage_disk") ); ModelBakery.registerItemVariants(RefinedStorageItems.STORAGE_PART, @@ -58,11 +58,11 @@ public class ClientProxy extends CommonProxy { ); // Items - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_cell", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_CELL, ItemStorageCell.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_cell", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_storage_disk", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_part", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_part", "inventory")); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 98a1ebd74..bd73a2575 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -72,7 +72,7 @@ public class CommonProxy { GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, "relay"); GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, "interface"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_CELL, "storage_cell"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, "storage_disk"); GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); @@ -267,7 +267,7 @@ public class CommonProxy { 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) ); - // Storage Cell Parts + // Storage Parts GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), "EPE", "SRS", @@ -308,8 +308,8 @@ public class CommonProxy { 'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K) ); - // Storage Cells - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_1K)), + // Storage Disks + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_1K)), "GRG", "RPR", "EEE", @@ -319,7 +319,7 @@ public class CommonProxy { 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_4K)), + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_4K)), "GRG", "RPR", "EEE", @@ -329,7 +329,7 @@ public class CommonProxy { 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_16K)), + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_16K)), "GRG", "RPR", "EEE", @@ -339,7 +339,7 @@ public class CommonProxy { 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); - GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_CELL, 1, ItemStorageCell.TYPE_64K)), + GameRegistry.addRecipe(NBTStorage.initNBT(new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_64K)), "GRG", "RPR", "EEE", diff --git a/src/main/java/refinedstorage/storage/CellStorage.java b/src/main/java/refinedstorage/storage/DiskStorage.java similarity index 56% rename from src/main/java/refinedstorage/storage/CellStorage.java rename to src/main/java/refinedstorage/storage/DiskStorage.java index 90f8ae80a..f54060035 100755 --- a/src/main/java/refinedstorage/storage/CellStorage.java +++ b/src/main/java/refinedstorage/storage/DiskStorage.java @@ -1,15 +1,15 @@ package refinedstorage.storage; import net.minecraft.item.ItemStack; -import refinedstorage.item.ItemStorageCell; +import refinedstorage.item.ItemStorageDisk; import refinedstorage.tile.TileDrive; import refinedstorage.tile.settings.ModeSettingUtils; -public class CellStorage extends NBTStorage { +public class DiskStorage extends NBTStorage { private TileDrive drive; - public CellStorage(ItemStack cell, TileDrive drive) { - super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); + public DiskStorage(ItemStack disk, TileDrive drive) { + super(disk.getTagCompound(), getCapacity(disk), drive.getPriority()); this.drive = drive; } @@ -23,17 +23,17 @@ public class CellStorage extends NBTStorage { return false; } - public static int getCapacity(ItemStack cell) { - switch (cell.getItemDamage()) { - case ItemStorageCell.TYPE_1K: + public static int getCapacity(ItemStack disk) { + switch (disk.getItemDamage()) { + case ItemStorageDisk.TYPE_1K: return 1000; - case ItemStorageCell.TYPE_4K: + case ItemStorageDisk.TYPE_4K: return 4000; - case ItemStorageCell.TYPE_16K: + case ItemStorageDisk.TYPE_16K: return 16000; - case ItemStorageCell.TYPE_64K: + case ItemStorageDisk.TYPE_64K: return 64000; - case ItemStorageCell.TYPE_CREATIVE: + case ItemStorageDisk.TYPE_CREATIVE: return -1; } diff --git a/src/main/java/refinedstorage/tile/TileDrive.java b/src/main/java/refinedstorage/tile/TileDrive.java index 06cc95914..02a3c5fa6 100755 --- a/src/main/java/refinedstorage/tile/TileDrive.java +++ b/src/main/java/refinedstorage/tile/TileDrive.java @@ -50,7 +50,7 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage public void addStorages(List storages) { for (int i = 0; i < getSizeInventory(); ++i) { if (getStackInSlot(i) != null) { - storages.add(new CellStorage(getStackInSlot(i), this)); + storages.add(new DiskStorage(getStackInSlot(i), this)); } } } @@ -205,13 +205,13 @@ public class TileDrive extends TileMachine implements IStorageProvider, IStorage ItemStack stack = getStackInSlot(i); if (stack != null) { - int cellCapacity = CellStorage.getCapacity(stack); + int diskCapacity = DiskStorage.getCapacity(stack); - if (cellCapacity == -1) { + if (diskCapacity == -1) { return -1; } - capacity += cellCapacity; + capacity += diskCapacity; } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 2d4b9a3fd..978d6e58f 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -91,11 +91,11 @@ block.refinedstorage:storage.4.name=Creative Storage Block block.refinedstorage:relay.name=Relay block.refinedstorage:interface.name=Interface -item.refinedstorage:storage_cell.0.name=1k Storage Cell -item.refinedstorage:storage_cell.1.name=4k Storage Cell -item.refinedstorage:storage_cell.2.name=16k Storage Cell -item.refinedstorage:storage_cell.3.name=64k Storage Cell -item.refinedstorage:storage_cell.4.name=Creative Storage Cell +item.refinedstorage:storage_disk.0.name=1k Storage Disk +item.refinedstorage:storage_disk.1.name=4k Storage Disk +item.refinedstorage:storage_disk.2.name=16k Storage Disk +item.refinedstorage:storage_disk.3.name=64k Storage Disk +item.refinedstorage:storage_disk.4.name=Creative Storage Disk item.refinedstorage:wireless_grid.0.name=Wireless Grid item.refinedstorage:wireless_grid.1.name=Wireless Crafting Grid item.refinedstorage:wireless_grid_plate.name=Wireless Grid Plate diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 4cc12c252..2a0f31d81 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -91,11 +91,11 @@ block.refinedstorage:storage.4.name=Creative Opslag Blok block.refinedstorage:relay.name=Relais block.refinedstorage:interface.name=Interface -item.refinedstorage:storage_cell.0.name=1k Opslagcel -item.refinedstorage:storage_cell.1.name=4k Opslagcel -item.refinedstorage:storage_cell.2.name=16k Opslagcel -item.refinedstorage:storage_cell.3.name=64k Opslagcel -item.refinedstorage:storage_cell.4.name=Creative Opslagcel +item.refinedstorage:storage_disk.0.name=1k Opslagschijf +item.refinedstorage:storage_disk.1.name=4k Opslagschijf +item.refinedstorage:storage_disk.2.name=16k Opslagschijf +item.refinedstorage:storage_disk.3.name=64k Opslagschijf +item.refinedstorage:storage_disk.4.name=Creative Opslagschijf item.refinedstorage:wireless_grid.0.name=Draadloze Rooster item.refinedstorage:wireless_grid.1.name=Draadloze Crafting Rooster item.refinedstorage:wireless_grid_plate.name=Draadloze Rooster Bord diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json deleted file mode 100755 index e6ec70183..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_cell" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json new file mode 100755 index 000000000..376f90061 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json deleted file mode 100755 index 92eb3c266..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_cell" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json similarity index 50% rename from src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json rename to src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json index 8824a609d..c44af3b43 100755 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_cell.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "refinedstorage:items/4k_storage_cell" + "layer0": "refinedstorage:items/1k_storage_disk" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json similarity index 50% rename from src/main/resources/assets/refinedstorage/models/item/blank_pattern.json rename to src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json index fdd3537e0..860a01e61 100755 --- a/src/main/resources/assets/refinedstorage/models/item/blank_pattern.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "refinedstorage:items/blank_pattern" + "layer0": "refinedstorage:items/4k_storage_disk" } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json deleted file mode 100755 index 45364a6d2..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_cell" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json new file mode 100755 index 000000000..e946fe259 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json deleted file mode 100755 index 3088d2636..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/creative_storage_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/creative_storage_cell" - } -} diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json new file mode 100755 index 000000000..bc65d8493 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/creative_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/16k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/1k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/4k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/64k_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png diff --git a/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png b/src/main/resources/assets/refinedstorage/textures/items/blank_pattern.png deleted file mode 100755 index 98129707b2e23d930db40204e2844283007c17aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M_VM#bI5Q8{GmW($5%CJPVrJRD93#1v! zB|7C0Rk}-S^cnfl6c!a&a-Q>S|Nh_al8F4v^)q`=mEBq*+m%TA{k~*b=6o<1=-uW` zp!uC@thEJz#gltkzkHRoix=s1I?`w~Bn(4ox7+HiR!f%89%beHNtR9@WVQUPKn`H; zu%<~86jPKWiN@V-S9-mkf>XmFPS`jAV}LUeAXvbLe@+_!6Yu(6wr<0302q*@h+^U( z2y`+G#sTc9rh@{^>{n#t>P-_g7m04?A5r*diwYeYmqJkOiT*&4bzfWNzx ZJ^={W`O})r_)q`<002ovPDHLkV1l3u$7KKj diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/items/creative_storage_cell.png rename to src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png From aff57affe54b70e6e82722ee93eafa37e5d85653 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 20:40:20 +0100 Subject: [PATCH 07/76] Rename drive to disk drive --- .../refinedstorage/RefinedStorageBlocks.java | 2 +- .../refinedstorage/RefinedStorageGui.java | 2 +- .../{BlockDrive.java => BlockDiskDrive.java} | 12 +- ...inerDrive.java => ContainerDiskDrive.java} | 42 +- .../java/refinedstorage/gui/GuiHandler.java | 8 +- .../java/refinedstorage/gui/GuiSolderer.java | 3 +- .../gui/GuiWirelessTransmitter.java | 3 +- .../network/MessagePriorityUpdate.java | 6 +- .../refinedstorage/proxy/ClientProxy.java | 2 +- .../refinedstorage/proxy/CommonProxy.java | 8 +- .../refinedstorage/storage/DiskStorage.java | 12 +- .../{TileDrive.java => TileDiskDrive.java} | 610 +++++++++--------- ...rive.java => SoldererRecipeDiskDrive.java} | 64 +- .../{drive.json => disk_drive.json} | 2 +- .../assets/refinedstorage/lang/en_US.lang | 4 +- .../assets/refinedstorage/lang/nl_NL.lang | 4 +- .../blocks/{drive.png => disk_drive.png} | Bin .../gui/{drive.png => disk_drive.png} | Bin 18 files changed, 393 insertions(+), 391 deletions(-) rename src/main/java/refinedstorage/block/{BlockDrive.java => BlockDiskDrive.java} (77%) rename src/main/java/refinedstorage/container/{ContainerDrive.java => ContainerDiskDrive.java} (78%) rename src/main/java/refinedstorage/tile/{TileDrive.java => TileDiskDrive.java} (92%) rename src/main/java/refinedstorage/tile/solderer/{SoldererRecipeDrive.java => SoldererRecipeDiskDrive.java} (83%) rename src/main/resources/assets/refinedstorage/blockstates/{drive.json => disk_drive.json} (91%) rename src/main/resources/assets/refinedstorage/textures/blocks/{drive.png => disk_drive.png} (100%) rename src/main/resources/assets/refinedstorage/textures/gui/{drive.png => disk_drive.png} (100%) diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java index f9b83e9b0..1d717ec22 100755 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -6,7 +6,7 @@ public final class RefinedStorageBlocks { public static final BlockController CONTROLLER = new BlockController(); public static final BlockCable CABLE = new BlockCable(); public static final BlockGrid GRID = new BlockGrid(); - public static final BlockDrive DRIVE = new BlockDrive(); + public static final BlockDiskDrive DISK_DRIVE = new BlockDiskDrive(); public static final BlockExternalStorage EXTERNAL_STORAGE = new BlockExternalStorage(); public static final BlockImporter IMPORTER = new BlockImporter(); public static final BlockExporter EXPORTER = new BlockExporter(); diff --git a/src/main/java/refinedstorage/RefinedStorageGui.java b/src/main/java/refinedstorage/RefinedStorageGui.java index b154ef611..d9b975e50 100755 --- a/src/main/java/refinedstorage/RefinedStorageGui.java +++ b/src/main/java/refinedstorage/RefinedStorageGui.java @@ -3,7 +3,7 @@ package refinedstorage; public final class RefinedStorageGui { public static final int CONTROLLER = 0; public static final int GRID = 1; - public static final int DRIVE = 2; + public static final int DISK_DRIVE = 2; public static final int IMPORTER = 4; public static final int EXPORTER = 5; public static final int DETECTOR = 6; diff --git a/src/main/java/refinedstorage/block/BlockDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java similarity index 77% rename from src/main/java/refinedstorage/block/BlockDrive.java rename to src/main/java/refinedstorage/block/BlockDiskDrive.java index 9f77ef4f2..72b7dca8f 100755 --- a/src/main/java/refinedstorage/block/BlockDrive.java +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -9,22 +9,22 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; -import refinedstorage.tile.TileDrive; +import refinedstorage.tile.TileDiskDrive; -public class BlockDrive extends BlockMachine { - public BlockDrive() { - super("drive"); +public class BlockDiskDrive extends BlockMachine { + public BlockDiskDrive() { + super("disk_drive"); } @Override public TileEntity createTileEntity(World world, IBlockState state) { - return new TileDrive(); + return new TileDiskDrive(); } @Override public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { if (!world.isRemote) { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); } return true; diff --git a/src/main/java/refinedstorage/container/ContainerDrive.java b/src/main/java/refinedstorage/container/ContainerDiskDrive.java similarity index 78% rename from src/main/java/refinedstorage/container/ContainerDrive.java rename to src/main/java/refinedstorage/container/ContainerDiskDrive.java index bb01836b5..e2d0a753c 100755 --- a/src/main/java/refinedstorage/container/ContainerDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDiskDrive.java @@ -1,21 +1,21 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import refinedstorage.RefinedStorageItems; -import refinedstorage.container.slot.BasicItemValidator; -import refinedstorage.container.slot.SlotFiltered; -import refinedstorage.tile.TileDrive; - -public class ContainerDrive extends ContainerStorage { - public ContainerDrive(EntityPlayer player, TileDrive drive) { - super(player, drive.getInventory()); - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); - } - - for (int i = 0; i < 4; ++i) { - addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); - } - } -} +package refinedstorage.container; + +import net.minecraft.entity.player.EntityPlayer; +import refinedstorage.RefinedStorageItems; +import refinedstorage.container.slot.BasicItemValidator; +import refinedstorage.container.slot.SlotFiltered; +import refinedstorage.tile.TileDiskDrive; + +public class ContainerDiskDrive extends ContainerStorage { + public ContainerDiskDrive(EntityPlayer player, TileDiskDrive drive) { + super(player, drive.getInventory()); + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); + } + + for (int i = 0; i < 4; ++i) { + addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); + } + } +} diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index 5273c3602..9ff5d33df 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -18,8 +18,8 @@ public class GuiHandler implements IGuiHandler { return new ContainerController(player); case RefinedStorageGui.GRID: return new ContainerGrid(player, (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new ContainerDrive(player, (TileDrive) tile); + case RefinedStorageGui.DISK_DRIVE: + return new ContainerDiskDrive(player, (TileDiskDrive) tile); case RefinedStorageGui.IMPORTER: return new ContainerImporter(player, (TileImporter) tile); case RefinedStorageGui.EXPORTER: @@ -59,8 +59,8 @@ public class GuiHandler implements IGuiHandler { return new GuiController((ContainerController) getContainer(ID, player, tile), (TileController) tile); case RefinedStorageGui.GRID: return new GuiGrid((ContainerGrid) getContainer(ID, player, tile), (TileGrid) tile); - case RefinedStorageGui.DRIVE: - return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/drive.png"); + case RefinedStorageGui.DISK_DRIVE: + return new GuiStorage((ContainerStorage) getContainer(ID, player, tile), (IStorageGui) tile, "gui/disk_drive.png"); case RefinedStorageGui.IMPORTER: return new GuiImporter((ContainerImporter) getContainer(ID, player, tile), (TileImporter) tile); case RefinedStorageGui.EXPORTER: diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index f487e70bb..581597533 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -1,13 +1,14 @@ package refinedstorage.gui; import net.minecraft.inventory.Container; +import refinedstorage.container.ContainerSolderer; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; public class GuiSolderer extends GuiBase { private TileSolderer solderer; - public GuiSolderer(Container container, TileSolderer solderer) { + public GuiSolderer(ContainerSolderer container, TileSolderer solderer) { super(container, 176, 177); this.solderer = solderer; diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index 2b431717a..1b1ae37b3 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,13 +1,14 @@ package refinedstorage.gui; import net.minecraft.inventory.Container; +import refinedstorage.container.ContainerWirelessTransmitter; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; public class GuiWirelessTransmitter extends GuiBase { private TileWirelessTransmitter wirelessTransmitter; - public GuiWirelessTransmitter(Container container, TileWirelessTransmitter wirelessTransmitter) { + public GuiWirelessTransmitter(ContainerWirelessTransmitter container, TileWirelessTransmitter wirelessTransmitter) { super(container, 176, 137); this.wirelessTransmitter = wirelessTransmitter; diff --git a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java index 89ab018cf..d3b66c873 100755 --- a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java +++ b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java @@ -5,7 +5,7 @@ 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.TileDrive; +import refinedstorage.tile.TileDiskDrive; import refinedstorage.tile.TileExternalStorage; import refinedstorage.tile.TileStorage; @@ -49,8 +49,8 @@ public class MessagePriorityUpdate extends MessageHandlerPlayerToServer storages) { - for (int i = 0; i < getSizeInventory(); ++i) { - if (getStackInSlot(i) != null) { - storages.add(new DiskStorage(getStackInSlot(i), this)); - } - } - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(filterInventory, 1, nbt); - - if (nbt.hasKey(NBT_PRIORITY)) { - priority = nbt.getInteger(NBT_PRIORITY); - } - - if (nbt.hasKey(NBT_COMPARE)) { - compare = nbt.getInteger(NBT_COMPARE); - } - - if (nbt.hasKey(NBT_MODE)) { - mode = nbt.getInteger(NBT_MODE); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(filterInventory, 1, nbt); - - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } - - @Override - public int getCompare() { - return compare; - } - - @Override - public void setCompare(int compare) { - markDirty(); - - this.compare = compare; - } - - @Override - public boolean isWhitelist() { - return mode == 0; - } - - @Override - public boolean isBlacklist() { - return mode == 1; - } - - @Override - public void setToWhitelist() { - markDirty(); - - this.mode = 0; - } - - @Override - public void setToBlacklist() { - markDirty(); - - this.mode = 1; - } - - @Override - public String getName() { - return "block.refinedstorage:drive.name"; - } - - @Override - public IInventory getInventory() { - return filterInventory; - } - - @Override - public IRedstoneModeSetting getRedstoneModeSetting() { - return this; - } - - @Override - public ICompareSetting getCompareSetting() { - return this; - } - - @Override - public IModeSetting getModeSetting() { - return this; - } - - @Override - public void onPriorityChanged(int priority) { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - - @Override - public int getPriority() { - return priority; - } - - public void setPriority(int priority) { - markDirty(); - - this.priority = priority; - } - - @Override - public int getStored() { - int stored = 0; - - for (int i = 0; i < getSizeInventory(); ++i) { - ItemStack stack = getStackInSlot(i); - - if (stack != null) { - stored += NBTStorage.getStored(stack.getTagCompound()); - } - } - - return stored; - } - - @Override - public int getCapacity() { - int capacity = 0; - - for (int i = 0; i < getSizeInventory(); ++i) { - ItemStack stack = getStackInSlot(i); - - if (stack != null) { - int diskCapacity = DiskStorage.getCapacity(stack); - - if (diskCapacity == -1) { - return -1; - } - - capacity += diskCapacity; - } - } - - return capacity; - } - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public void openInventory(EntityPlayer player) { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) { - inventory.closeInventory(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public int getField(int id) { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() { - return inventory.getFieldCount(); - } - - @Override - public void clear() { - inventory.clear(); - } - - @Override - public boolean hasCustomName() { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() { - return inventory.getDisplayName(); - } - - @Override - public IInventory getDroppedInventory() { - return inventory; - } -} +package refinedstorage.tile; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorage; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.network.MessagePriorityUpdate; +import refinedstorage.storage.*; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.IRedstoneModeSetting; +import refinedstorage.util.InventoryUtils; + +import java.util.List; + +public class TileDiskDrive extends TileMachine implements IStorageProvider, IStorageGui, ICompareSetting, IModeSetting, IInventory { + public static final String NBT_PRIORITY = "Priority"; + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; + + private InventorySimple inventory = new InventorySimple("disk_drive", 8, this); + private InventorySimple filterInventory = new InventorySimple("filters", 9, this); + + private int priority = 0; + private int compare = 0; + private int mode = 0; + + @Override + public int getEnergyUsage() { + int base = 5; + + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + base += 2; + } + } + + return base; + } + + @Override + public void updateMachine() { + } + + @Override + public void addStorages(List storages) { + for (int i = 0; i < getSizeInventory(); ++i) { + if (getStackInSlot(i) != null) { + storages.add(new DiskStorage(getStackInSlot(i), this)); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(inventory, 0, nbt); + InventoryUtils.restoreInventory(filterInventory, 1, nbt); + + if (nbt.hasKey(NBT_PRIORITY)) { + priority = nbt.getInteger(NBT_PRIORITY); + } + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + InventoryUtils.saveInventory(inventory, 0, nbt); + InventoryUtils.saveInventory(filterInventory, 1, nbt); + + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public boolean isWhitelist() { + return mode == 0; + } + + @Override + public boolean isBlacklist() { + return mode == 1; + } + + @Override + public void setToWhitelist() { + markDirty(); + + this.mode = 0; + } + + @Override + public void setToBlacklist() { + markDirty(); + + this.mode = 1; + } + + @Override + public String getName() { + return "block.refinedstorage:disk_drive.name"; + } + + @Override + public IInventory getInventory() { + return filterInventory; + } + + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } + + @Override + public ICompareSetting getCompareSetting() { + return this; + } + + @Override + public IModeSetting getModeSetting() { + return this; + } + + @Override + public void onPriorityChanged(int priority) { + RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); + } + + @Override + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + markDirty(); + + this.priority = priority; + } + + @Override + public int getStored() { + int stored = 0; + + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); + + if (stack != null) { + stored += NBTStorage.getStored(stack.getTagCompound()); + } + } + + return stored; + } + + @Override + public int getCapacity() { + int capacity = 0; + + for (int i = 0; i < getSizeInventory(); ++i) { + ItemStack stack = getStackInSlot(i); + + if (stack != null) { + int diskCapacity = DiskStorage.getCapacity(stack); + + if (diskCapacity == -1) { + return -1; + } + + capacity += diskCapacity; + } + } + + return capacity; + } + + @Override + public int getSizeInventory() { + return inventory.getSizeInventory(); + } + + @Override + public ItemStack getStackInSlot(int slot) { + return inventory.getStackInSlot(slot); + } + + @Override + public ItemStack decrStackSize(int slot, int count) { + return inventory.decrStackSize(slot, count); + } + + @Override + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + inventory.setInventorySlotContents(slot, stack); + } + + @Override + public int getInventoryStackLimit() { + return inventory.getInventoryStackLimit(); + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return inventory.isUseableByPlayer(player); + } + + @Override + public void openInventory(EntityPlayer player) { + inventory.openInventory(player); + } + + @Override + public void closeInventory(EntityPlayer player) { + inventory.closeInventory(player); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return inventory.isItemValidForSlot(slot, stack); + } + + @Override + public int getField(int id) { + return inventory.getField(id); + } + + @Override + public void setField(int id, int value) { + inventory.setField(id, value); + } + + @Override + public int getFieldCount() { + return inventory.getFieldCount(); + } + + @Override + public void clear() { + inventory.clear(); + } + + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } + + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public IInventory getDroppedInventory() { + return inventory; + } +} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java similarity index 83% rename from src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java rename to src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java index 0e019bd05..15c479fd5 100755 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java @@ -1,32 +1,32 @@ -package refinedstorage.tile.solderer; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.item.ItemProcessor; - -public class SoldererRecipeDrive implements ISoldererRecipe { - @Override - public ItemStack getRow(int row) { - if (row == 0) { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } else if (row == 1) { - return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); - } else if (row == 2) { - return new ItemStack(Blocks.chest); - } - - return null; - } - - @Override - public ItemStack getResult() { - return new ItemStack(RefinedStorageBlocks.DRIVE); - } - - @Override - public int getDuration() { - return 500; - } -} +package refinedstorage.tile.solderer; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageItems; +import refinedstorage.item.ItemProcessor; + +public class SoldererRecipeDiskDrive implements ISoldererRecipe { + @Override + public ItemStack getRow(int row) { + if (row == 0) { + return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); + } else if (row == 1) { + return new ItemStack(RefinedStorageBlocks.MACHINE_CASING); + } else if (row == 2) { + return new ItemStack(Blocks.chest); + } + + return null; + } + + @Override + public ItemStack getResult() { + return new ItemStack(RefinedStorageBlocks.DISK_DRIVE); + } + + @Override + public int getDuration() { + return 500; + } +} diff --git a/src/main/resources/assets/refinedstorage/blockstates/drive.json b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json similarity index 91% rename from src/main/resources/assets/refinedstorage/blockstates/drive.json rename to src/main/resources/assets/refinedstorage/blockstates/disk_drive.json index 7498bdd96..2c84db2ba 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/drive.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -5,7 +5,7 @@ "textures": { "side": "refinedstorage:blocks/side", "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/drive" + "front": "refinedstorage:blocks/disk_drive" } }, "variants": { diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 978d6e58f..4ca573f22 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -3,7 +3,7 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller gui.refinedstorage:grid=Grid -gui.refinedstorage:drive=Drive +gui.refinedstorage:disk_drive=Drive gui.refinedstorage:external_storage=External Storage gui.refinedstorage:importer=Importer gui.refinedstorage:exporter=Exporter @@ -73,7 +73,7 @@ block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:cable.name=Cable block.refinedstorage:grid.0.name=Grid block.refinedstorage:grid.1.name=Crafting Grid -block.refinedstorage:drive.name=Drive +block.refinedstorage:disk_drive.name=Disk Drive block.refinedstorage:external_storage.name=External Storage block.refinedstorage:importer.name=Importer block.refinedstorage:exporter.name=Exporter diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 2a0f31d81..261a9985b 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -3,7 +3,7 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller gui.refinedstorage:grid=Rooster -gui.refinedstorage:drive=Schijf +gui.refinedstorage:disk_drive=Schijf gui.refinedstorage:external_storage=Externe Opslag gui.refinedstorage:importer=Importeur gui.refinedstorage:exporter=Exporteur @@ -73,7 +73,7 @@ block.refinedstorage:controller.1.name=Creative Controller block.refinedstorage:cable.name=Kabel block.refinedstorage:grid.0.name=Rooster block.refinedstorage:grid.1.name=Crafting Rooster -block.refinedstorage:drive.name=Schijf +block.refinedstorage:disk_drive.name=Schijf block.refinedstorage:external_storage.name=Externe Opslag block.refinedstorage:importer.name=Importeur block.refinedstorage:exporter.name=Exporteur diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/drive.png rename to src/main/resources/assets/refinedstorage/textures/blocks/disk_drive.png diff --git a/src/main/resources/assets/refinedstorage/textures/gui/drive.png b/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/gui/drive.png rename to src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png From a0c372b6ccf8028dc45189d05c4e96fa0482f223 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 20:44:30 +0100 Subject: [PATCH 08/76] Fix for #2 --- .../refinedstorage/proxy/CommonProxy.java | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 1d69d0998..afaafb19d 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -21,6 +21,7 @@ import refinedstorage.network.*; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; import refinedstorage.tile.solderer.*; +import static refinedstorage.RefinedStorage.ID; public class CommonProxy { public void preInit(FMLPreInitializationEvent e) { @@ -39,47 +40,47 @@ public class CommonProxy { NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); - GameRegistry.registerTileEntity(TileController.class, "controller"); - GameRegistry.registerTileEntity(TileCable.class, "cable"); - GameRegistry.registerTileEntity(TileGrid.class, "grid"); - GameRegistry.registerTileEntity(TileDiskDrive.class, "disk_drive"); - GameRegistry.registerTileEntity(TileExternalStorage.class, "external_storage"); - GameRegistry.registerTileEntity(TileImporter.class, "importer"); - GameRegistry.registerTileEntity(TileExporter.class, "exporter"); - GameRegistry.registerTileEntity(TileDetector.class, "detector"); - GameRegistry.registerTileEntity(TileSolderer.class, "solderer"); - GameRegistry.registerTileEntity(TileWirelessTransmitter.class, "wireless_transmitter"); - GameRegistry.registerTileEntity(TileDestructor.class, "destructor"); - GameRegistry.registerTileEntity(TileConstructor.class, "constructor"); - GameRegistry.registerTileEntity(TileStorage.class, "storage"); - GameRegistry.registerTileEntity(TileRelay.class, "relay"); - GameRegistry.registerTileEntity(TileInterface.class, "interface"); + GameRegistry.registerTileEntity(TileController.class, ID + ":controller"); + GameRegistry.registerTileEntity(TileCable.class, ID + ":cable"); + GameRegistry.registerTileEntity(TileGrid.class, ID + ":grid"); + GameRegistry.registerTileEntity(TileDiskDrive.class, ID + ":disk_drive"); + GameRegistry.registerTileEntity(TileExternalStorage.class, ID + ":external_storage"); + GameRegistry.registerTileEntity(TileImporter.class, ID + ":importer"); + GameRegistry.registerTileEntity(TileExporter.class, ID + ":exporter"); + GameRegistry.registerTileEntity(TileDetector.class, ID + ":detector"); + GameRegistry.registerTileEntity(TileSolderer.class, ID + ":solderer"); + GameRegistry.registerTileEntity(TileWirelessTransmitter.class, ID + ":wireless_transmitter"); + GameRegistry.registerTileEntity(TileDestructor.class, ID + ":destructor"); + GameRegistry.registerTileEntity(TileConstructor.class, ID + ":constructor"); + GameRegistry.registerTileEntity(TileStorage.class, ID + ":storage"); + GameRegistry.registerTileEntity(TileRelay.class, ID + ":relay"); + GameRegistry.registerTileEntity(TileInterface.class, ID + ":interface"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, "controller"); - GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, "cable"); - GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, "grid"); - GameRegistry.registerBlock(RefinedStorageBlocks.DISK_DRIVE, "disk_drive"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, "external_storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, "importer"); - GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, "exporter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, "detector"); - GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, "machine_casing"); - GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, "solderer"); - GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, "wireless_transmitter"); - GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, "destructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, "constructor"); - GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, "storage"); - GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, "relay"); - GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, "interface"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONTROLLER, ItemBlockController.class, ID + ":controller"); + GameRegistry.registerBlock(RefinedStorageBlocks.CABLE, ID + ":cable"); + GameRegistry.registerBlock(RefinedStorageBlocks.GRID, ItemBlockGrid.class, ID + ":grid"); + GameRegistry.registerBlock(RefinedStorageBlocks.DISK_DRIVE, ID + ":disk_drive"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE, ID + ":external_storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.IMPORTER, ID + ":importer"); + GameRegistry.registerBlock(RefinedStorageBlocks.EXPORTER, ID + ":exporter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, ID + ":detector"); + GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, ID + ":machine_casing"); + GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, ID + ":solderer"); + GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, ID + ":wireless_transmitter"); + GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, ID + ":destructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, ID + ":constructor"); + GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, ID + ":storage"); + GameRegistry.registerBlock(RefinedStorageBlocks.RELAY, ID + ":relay"); + GameRegistry.registerBlock(RefinedStorageBlocks.INTERFACE, ID + ":interface"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, "storage_disk"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, "wireless_grid"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, "wireless_grid_plate"); - GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, "quartz_enriched_iron"); - GameRegistry.registerItem(RefinedStorageItems.CORE, "core"); - GameRegistry.registerItem(RefinedStorageItems.SILICON, "silicon"); - GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, "processor"); - GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, "storage_part"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, ID + ":storage_disk"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, ID + ":wireless_grid"); + GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, ID + ":wireless_grid_plate"); + GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, ID + ":quartz_enriched_iron"); + GameRegistry.registerItem(RefinedStorageItems.CORE, ID + ":core"); + GameRegistry.registerItem(RefinedStorageItems.SILICON, ID + ":silicon"); + GameRegistry.registerItem(RefinedStorageItems.PROCESSOR, ID + ":processor"); + GameRegistry.registerItem(RefinedStorageItems.STORAGE_PART, ID + ":storage_part"); // Processors SoldererRegistry.addRecipe(new SoldererRecipePrintedProcessor(ItemProcessor.TYPE_PRINTED_BASIC)); From 44c370935263084604303beb9fcd151569fdf329 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 21:09:43 +0100 Subject: [PATCH 09/76] Fix NPE in sorting grid --- src/main/java/refinedstorage/gui/GuiGrid.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 3ce054d61..1d946f1e2 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -220,10 +220,12 @@ public class GuiGrid extends GuiBase { items.sort(new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); - } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + if (o1 != null && o2 != null) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + } } return 0; @@ -234,10 +236,12 @@ public class GuiGrid extends GuiBase { items.sort(new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); - } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + if (o1 != null && o2 != null) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + } } return 0; From a8e6ea5439a0db08ad11f57da8db8e77d3fad948 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 21:59:19 +0100 Subject: [PATCH 10/76] Deep storage unit integration --- .../api/IDeepStorageUnit.java | 26 ++++ .../tile/TileExternalStorage.java | 144 +++++++++++++----- 2 files changed, 132 insertions(+), 38 deletions(-) create mode 100755 src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java new file mode 100755 index 000000000..5d6642d4c --- /dev/null +++ b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -0,0 +1,26 @@ +package powercrystals.minefactoryreloaded.api; + +import net.minecraft.item.ItemStack; + +public interface IDeepStorageUnit +{ + /** + * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize(). + */ + ItemStack getStoredItemType(); + + /** + * Sets the total amount of the item currently being stored, or zero if it wants to remove all items. + */ + void setStoredItemCount(int amount); + + /** + * Sets the type of the stored item and initializes the number of stored items to amount. Will overwrite any existing stored items. + */ + void setStoredItemType(ItemStack type, int amount); + + /** + * @return The maximum number of items the DSU can hold. + */ + int getMaxStoredCount(); +} \ No newline at end of file diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 7342f0441..0c13177c2 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; @@ -47,12 +48,24 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void addItems(List items) { - IInventory connectedInventory = getConnectedInventory(); + TileEntity connectedInventory = getConnectedInventory(); - if (connectedInventory != null) { - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) { - if (connectedInventory.getStackInSlot(i) != null) { - items.add(new StorageItem(connectedInventory.getStackInSlot(i))); + if (connectedInventory instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + + if (deep.getStoredItemType() != null) { + ItemStack stack = deep.getStoredItemType().copy(); + + while (stack.stackSize > 0) { + items.add(new StorageItem(stack.splitStack(Math.min(stack.getMaxStackSize(), stack.stackSize)))); + } + } + } else if (connectedInventory instanceof IInventory) { + IInventory inventory = (IInventory) connectedInventory; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + if (inventory.getStackInSlot(i) != null) { + items.add(new StorageItem(inventory.getStackInSlot(i))); } } } @@ -60,44 +73,65 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void push(ItemStack stack) { - IInventory connectedInventory = getConnectedInventory(); + TileEntity connectedInventory = getConnectedInventory(); - if (connectedInventory == null) { - return; + if (connectedInventory instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + + if (deep.getStoredItemType() == null) { + deep.setStoredItemType(stack, stack.stackSize); + } else { + deep.setStoredItemCount(deep.getStoredItemType().stackSize + stack.stackSize); + } + } else if (connectedInventory instanceof IInventory) { + InventoryUtils.pushToInventory((IInventory) connectedInventory, stack); } - - InventoryUtils.pushToInventory(connectedInventory, stack); } @Override public ItemStack take(ItemStack stack, int flags) { - IInventory connectedInventory = getConnectedInventory(); - - if (connectedInventory == null) { - return null; - } + TileEntity connectedInventory = getConnectedInventory(); int quantity = stack.stackSize; - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) { - ItemStack slot = connectedInventory.getStackInSlot(i); + if (connectedInventory instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; - if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { - if (quantity > slot.stackSize) { - quantity = slot.stackSize; + if (deep.getStoredItemType() != null) { + if (deep.getStoredItemType().stackSize < quantity) { + quantity = deep.getStoredItemType().stackSize; } - slot.stackSize -= quantity; + ItemStack took = deep.getStoredItemType().copy(); + took.stackSize = quantity; - if (slot.stackSize == 0) { - connectedInventory.setInventorySlotContents(i, null); + deep.setStoredItemCount(deep.getStoredItemType().stackSize - quantity); + + return took; + } + } else if (connectedInventory instanceof IInventory) { + IInventory inventory = (IInventory) connectedInventory; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); + + if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { + if (quantity > slot.stackSize) { + quantity = slot.stackSize; + } + + slot.stackSize -= quantity; + + if (slot.stackSize == 0) { + inventory.setInventorySlotContents(i, null); + } + + ItemStack newItem = slot.copy(); + + newItem.stackSize = quantity; + + return newItem; } - - ItemStack newItem = slot.copy(); - - newItem.stackSize = quantity; - - return newItem; } } @@ -106,20 +140,34 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public boolean canPush(ItemStack stack) { - IInventory connectedInventory = getConnectedInventory(); + if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack)) { + TileEntity connectedInventory = getConnectedInventory(); - if (connectedInventory == null) { - return false; + if (connectedInventory instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + + if (deep.getStoredItemType() != null) { + if (InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { + return (deep.getStoredItemType().stackSize + stack.stackSize) < deep.getMaxStoredCount(); + } + + return false; + } else { + return stack.stackSize < deep.getMaxStoredCount(); + } + } else if (connectedInventory instanceof IInventory) { + return InventoryUtils.canPushToInventory((IInventory) connectedInventory, stack); + } } - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); + return false; } - public IInventory getConnectedInventory() { + public TileEntity getConnectedInventory() { TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) { - return (IInventory) tile; + if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { + return tile; } return null; @@ -130,7 +178,19 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider super.toBytes(buf); buf.writeInt(priority); - buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); + + TileEntity connectedInventory = getConnectedInventory(); + + if (connectedInventory instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + + buf.writeInt(deep.getStoredItemType() == null ? 0 : deep.getStoredItemType().stackSize); + } else if (connectedInventory instanceof IInventory) { + buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedInventory)); + } else { + buf.writeInt(0); + } + buf.writeInt(compare); buf.writeInt(mode); } @@ -258,7 +318,15 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider return 0; } - return getConnectedInventory().getSizeInventory() * 64; + TileEntity connectedInventory = getConnectedInventory(); + + if (connectedInventory instanceof IDeepStorageUnit) { + return ((IDeepStorageUnit) connectedInventory).getMaxStoredCount(); + } else if (connectedInventory instanceof IInventory) { + return ((IInventory) connectedInventory).getSizeInventory() * 64; + } + + return 0; } @Override From 782f418364974c263ab60d854a507cdadae1c4ae Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 22:34:34 +0100 Subject: [PATCH 11/76] We need to compare the item to check if its what we want before we can take it out --- src/main/java/refinedstorage/tile/TileExternalStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 0c13177c2..1f6495414 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -97,7 +97,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider if (connectedInventory instanceof IDeepStorageUnit) { IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; - if (deep.getStoredItemType() != null) { + if (deep.getStoredItemType() != null && InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { if (deep.getStoredItemType().stackSize < quantity) { quantity = deep.getStoredItemType().stackSize; } From 108373f6eb4afc0ca9f4474caad4e8d91b9b3647 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 24 Mar 2016 23:32:34 +0100 Subject: [PATCH 12/76] Fix some stuff --- src/main/java/cofh/api/CoFHAPIProps.java | 6 +- .../java/cofh/api/energy/EnergyStorage.java | 217 +++++++------ .../cofh/api/energy/IEnergyConnection.java | 9 +- .../cofh/api/energy/IEnergyContainerItem.java | 61 ++-- .../java/cofh/api/energy/IEnergyHandler.java | 17 +- .../java/cofh/api/energy/IEnergyProvider.java | 22 +- .../java/cofh/api/energy/IEnergyReceiver.java | 22 +- .../java/cofh/api/energy/IEnergyStorage.java | 53 ++- .../cofh/api/energy/ItemEnergyContainer.java | 143 ++++---- .../cofh/api/energy/TileEnergyHandler.java | 73 +++-- .../java/cofh/api/energy/package-info.java | 2 +- .../api/IDeepStorageUnit.java | 3 +- .../block/BlockConstructor.java | 3 +- .../refinedstorage/block/BlockDestructor.java | 3 +- .../refinedstorage/block/BlockDetector.java | 2 +- .../refinedstorage/block/BlockDiskDrive.java | 3 +- .../refinedstorage/block/BlockExporter.java | 3 +- .../block/BlockExternalStorage.java | 3 +- .../refinedstorage/block/BlockImporter.java | 3 +- .../refinedstorage/block/BlockInterface.java | 3 +- .../refinedstorage/block/BlockSolderer.java | 3 +- .../refinedstorage/block/BlockStorage.java | 2 +- .../block/BlockWirelessTransmitter.java | 2 +- .../java/refinedstorage/gui/GuiSolderer.java | 1 - .../gui/GuiWirelessTransmitter.java | 1 - .../refinedstorage/proxy/CommonProxy.java | 1 + .../refinedstorage/blockstates/cable.json | 144 +++++---- .../blockstates/constructor.json | 102 +++--- .../blockstates/controller.json | 180 +++++------ .../blockstates/destructor.json | 102 +++--- .../refinedstorage/blockstates/detector.json | 104 +++--- .../blockstates/disk_drive.json | 86 ++--- .../refinedstorage/blockstates/exporter.json | 86 ++--- .../blockstates/external_storage.json | 86 ++--- .../refinedstorage/blockstates/grid.json | 114 +++---- .../refinedstorage/blockstates/importer.json | 86 ++--- .../refinedstorage/blockstates/interface.json | 68 ++-- .../blockstates/machine_casing.json | 56 ++-- .../refinedstorage/blockstates/relay.json | 74 ++--- .../refinedstorage/blockstates/solderer.json | 102 +++--- .../refinedstorage/blockstates/storage.json | 68 ++-- .../blockstates/wireless_transmitter.json | 108 +++---- .../refinedstorage/models/block/cable.json | 306 ++++++++++++------ .../models/block/cable_core.json | 106 ++++-- .../models/block/cable_down.json | 106 ++++-- .../models/block/cable_east.json | 106 ++++-- .../models/block/cable_north.json | 106 ++++-- .../models/block/cable_south.json | 106 ++++-- .../refinedstorage/models/block/cable_up.json | 106 ++++-- .../models/block/cable_west.json | 106 ++++-- .../models/item/16k_storage_disk.json | 8 +- .../models/item/16k_storage_part.json | 8 +- .../models/item/1k_storage_disk.json | 8 +- .../models/item/1k_storage_part.json | 8 +- .../models/item/4k_storage_disk.json | 8 +- .../models/item/4k_storage_part.json | 8 +- .../models/item/64k_storage_disk.json | 8 +- .../models/item/64k_storage_part.json | 8 +- .../item/advanced_printed_processor.json | 8 +- .../models/item/advanced_processor.json | 8 +- .../models/item/basic_printed_processor.json | 8 +- .../models/item/basic_processor.json | 8 +- .../models/item/construction_core.json | 8 +- .../models/item/creative_storage_disk.json | 8 +- .../models/item/destruction_core.json | 8 +- .../item/improved_printed_processor.json | 8 +- .../models/item/improved_processor.json | 8 +- .../models/item/printed_silicon.json | 8 +- .../models/item/quartz_enriched_iron.json | 8 +- .../refinedstorage/models/item/silicon.json | 8 +- .../models/item/wireless_grid_connected.json | 8 +- .../item/wireless_grid_disconnected.json | 8 +- .../models/item/wireless_grid_plate.json | 8 +- 73 files changed, 1911 insertions(+), 1548 deletions(-) diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java index eb2e05ade..becea23e0 100755 --- a/src/main/java/cofh/api/CoFHAPIProps.java +++ b/src/main/java/cofh/api/CoFHAPIProps.java @@ -2,10 +2,10 @@ package cofh.api; public class CoFHAPIProps { - private CoFHAPIProps() { + private CoFHAPIProps() { - } + } - public static final String VERSION = "1.8.9R1.2.0B1"; + public static final String VERSION = "1.8.9R1.2.0B1"; } diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java index dd7dd3e02..d5e34000c 100755 --- a/src/main/java/cofh/api/energy/EnergyStorage.java +++ b/src/main/java/cofh/api/energy/EnergyStorage.java @@ -6,157 +6,156 @@ import net.minecraft.nbt.NBTTagCompound; * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own. * * @author King Lemming - * */ public class EnergyStorage implements IEnergyStorage { - protected int energy; - protected int capacity; - protected int maxReceive; - protected int maxExtract; + protected int energy; + protected int capacity; + protected int maxReceive; + protected int maxExtract; - public EnergyStorage(int capacity) { + public EnergyStorage(int capacity) { - this(capacity, capacity, capacity); - } + this(capacity, capacity, capacity); + } - public EnergyStorage(int capacity, int maxTransfer) { + public EnergyStorage(int capacity, int maxTransfer) { - this(capacity, maxTransfer, maxTransfer); - } + this(capacity, maxTransfer, maxTransfer); + } - public EnergyStorage(int capacity, int maxReceive, int maxExtract) { + public EnergyStorage(int capacity, int maxReceive, int maxExtract) { - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } - public EnergyStorage readFromNBT(NBTTagCompound nbt) { + public EnergyStorage readFromNBT(NBTTagCompound nbt) { - this.energy = nbt.getInteger("Energy"); + this.energy = nbt.getInteger("Energy"); - if (energy > capacity) { - energy = capacity; - } - return this; - } + if (energy > capacity) { + energy = capacity; + } + return this; + } - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - if (energy < 0) { - energy = 0; - } - nbt.setInteger("Energy", energy); - return nbt; - } + if (energy < 0) { + energy = 0; + } + nbt.setInteger("Energy", energy); + return nbt; + } - public EnergyStorage setCapacity(int capacity) { + public EnergyStorage setCapacity(int capacity) { - this.capacity = capacity; + this.capacity = capacity; - if (energy > capacity) { - energy = capacity; - } - return this; - } + if (energy > capacity) { + energy = capacity; + } + return this; + } - public EnergyStorage setMaxTransfer(int maxTransfer) { + public EnergyStorage setMaxTransfer(int maxTransfer) { - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - return this; - } + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + return this; + } - public EnergyStorage setMaxReceive(int maxReceive) { + public EnergyStorage setMaxReceive(int maxReceive) { - this.maxReceive = maxReceive; - return this; - } + this.maxReceive = maxReceive; + return this; + } - public EnergyStorage setMaxExtract(int maxExtract) { + public EnergyStorage setMaxExtract(int maxExtract) { - this.maxExtract = maxExtract; - return this; - } + this.maxExtract = maxExtract; + return this; + } - public int getMaxReceive() { + public int getMaxReceive() { - return maxReceive; - } + return maxReceive; + } - public int getMaxExtract() { + public int getMaxExtract() { - return maxExtract; - } + return maxExtract; + } - /** - * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers - * are guaranteed to have it. - * - * @param energy - */ - public void setEnergyStored(int energy) { + /** + * This function is included to allow for server to client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers + * are guaranteed to have it. + * + * @param energy + */ + public void setEnergyStored(int energy) { - this.energy = energy; + this.energy = energy; - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } - /** - * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this - * externally, as not all IEnergyHandlers are guaranteed to have it. - * - * @param energy - */ - public void modifyEnergyStored(int energy) { + /** + * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this + * externally, as not all IEnergyHandlers are guaranteed to have it. + * + * @param energy + */ + public void modifyEnergyStored(int energy) { - this.energy += energy; + this.energy += energy; - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } + if (this.energy > capacity) { + this.energy = capacity; + } else if (this.energy < 0) { + this.energy = 0; + } + } - /* IEnergyStorage */ - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { + /* IEnergyStorage */ + @Override + public int receiveEnergy(int maxReceive, boolean simulate) { - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { - energy += energyReceived; - } - return energyReceived; - } + if (!simulate) { + energy += energyReceived; + } + return energyReceived; + } - @Override - public int extractEnergy(int maxExtract, boolean simulate) { + @Override + public int extractEnergy(int maxExtract, boolean simulate) { - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { - energy -= energyExtracted; - } - return energyExtracted; - } + if (!simulate) { + energy -= energyExtracted; + } + return energyExtracted; + } - @Override - public int getEnergyStored() { + @Override + public int getEnergyStored() { - return energy; - } + return energy; + } - @Override - public int getMaxEnergyStored() { + @Override + public int getMaxEnergyStored() { - return capacity; - } + return capacity; + } } diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java index 29ef0a1ce..b33a9d90a 100755 --- a/src/main/java/cofh/api/energy/IEnergyConnection.java +++ b/src/main/java/cofh/api/energy/IEnergyConnection.java @@ -10,13 +10,12 @@ import net.minecraft.util.EnumFacing; * Note that {@link IEnergyHandler} is an extension of this. * * @author King Lemming - * */ public interface IEnergyConnection { - /** - * Returns TRUE if the TileEntity can connect on a given side. - */ - boolean canConnectEnergy(EnumFacing from); + /** + * Returns TRUE if the TileEntity can connect on a given side. + */ + boolean canConnectEnergy(EnumFacing from); } diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java index 3ef725765..f5d2ebfd9 100755 --- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java +++ b/src/main/java/cofh/api/energy/IEnergyContainerItem.java @@ -8,45 +8,38 @@ import net.minecraft.item.ItemStack; * A reference implementation is provided {@link ItemEnergyContainer}. * * @author King Lemming - * */ public interface IEnergyContainerItem { - /** - * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged. - * - * @param container - * ItemStack to be charged. - * @param maxReceive - * Maximum amount of energy to be sent into the item. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received by the item. - */ - int receiveEnergy(ItemStack container, int maxReceive, boolean simulate); + /** + * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged. + * + * @param container ItemStack to be charged. + * @param maxReceive Maximum amount of energy to be sent into the item. + * @param simulate If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received by the item. + */ + int receiveEnergy(ItemStack container, int maxReceive, boolean simulate); - /** - * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally - * discharged. - * - * @param container - * ItemStack to be discharged. - * @param maxExtract - * Maximum amount of energy to be extracted from the item. - * @param simulate - * If TRUE, the discharge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the item. - */ - int extractEnergy(ItemStack container, int maxExtract, boolean simulate); + /** + * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally + * discharged. + * + * @param container ItemStack to be discharged. + * @param maxExtract Maximum amount of energy to be extracted from the item. + * @param simulate If TRUE, the discharge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted from the item. + */ + int extractEnergy(ItemStack container, int maxExtract, boolean simulate); - /** - * Get the amount of energy currently stored in the container item. - */ - int getEnergyStored(ItemStack container); + /** + * Get the amount of energy currently stored in the container item. + */ + int getEnergyStored(ItemStack container); - /** - * Get the max amount of energy that can be stored in the container item. - */ - int getMaxEnergyStored(ItemStack container); + /** + * Get the max amount of energy that can be stored in the container item. + */ + int getMaxEnergyStored(ItemStack container); } diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java index 16b236e7a..1d5dc5576 100755 --- a/src/main/java/cofh/api/energy/IEnergyHandler.java +++ b/src/main/java/cofh/api/energy/IEnergyHandler.java @@ -10,18 +10,17 @@ import net.minecraft.util.EnumFacing; * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this. * * @author King Lemming - * */ public interface IEnergyHandler extends IEnergyConnection { - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(EnumFacing from); + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(EnumFacing from); - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(EnumFacing from); + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(EnumFacing from); } diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java index ef0e09d06..784726a04 100755 --- a/src/main/java/cofh/api/energy/IEnergyProvider.java +++ b/src/main/java/cofh/api/energy/IEnergyProvider.java @@ -9,21 +9,17 @@ import net.minecraft.util.EnumFacing; * A reference implementation is provided {@link TileEnergyHandler}. * * @author King Lemming - * */ public interface IEnergyProvider extends IEnergyHandler { - /** - * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. - * - * @param from - * Orientation the energy is extracted from. - * @param maxExtract - * Maximum amount of energy to extract. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted. - */ - int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); + /** + * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. + * + * @param from Orientation the energy is extracted from. + * @param maxExtract Maximum amount of energy to extract. + * @param simulate If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted. + */ + int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); } diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java index 989e9baa5..c2b654029 100755 --- a/src/main/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/main/java/cofh/api/energy/IEnergyReceiver.java @@ -9,21 +9,17 @@ import net.minecraft.util.EnumFacing; * A reference implementation is provided {@link TileEnergyHandler}. * * @author King Lemming - * */ public interface IEnergyReceiver extends IEnergyHandler { - /** - * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. - * - * @param from - * Orientation the energy is received from. - * @param maxReceive - * Maximum amount of energy to receive. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received. - */ - int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); + /** + * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. + * + * @param from Orientation the energy is received from. + * @param maxReceive Maximum amount of energy to receive. + * @param simulate If TRUE, the charge will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) received. + */ + int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); } diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java index 414b26566..b69f1df79 100755 --- a/src/main/java/cofh/api/energy/IEnergyStorage.java +++ b/src/main/java/cofh/api/energy/IEnergyStorage.java @@ -7,40 +7,35 @@ package cofh.api.energy; * A reference implementation can be found at {@link EnergyStorage}. * * @author King Lemming - * */ public interface IEnergyStorage { - /** - * Adds energy to the storage. Returns quantity of energy that was accepted. - * - * @param maxReceive - * Maximum amount of energy to be inserted. - * @param simulate - * If TRUE, the insertion will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. - */ - int receiveEnergy(int maxReceive, boolean simulate); + /** + * Adds energy to the storage. Returns quantity of energy that was accepted. + * + * @param maxReceive Maximum amount of energy to be inserted. + * @param simulate If TRUE, the insertion will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. + */ + int receiveEnergy(int maxReceive, boolean simulate); - /** - * Removes energy from the storage. Returns quantity of energy that was removed. - * - * @param maxExtract - * Maximum amount of energy to be extracted. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. - */ - int extractEnergy(int maxExtract, boolean simulate); + /** + * Removes energy from the storage. Returns quantity of energy that was removed. + * + * @param maxExtract Maximum amount of energy to be extracted. + * @param simulate If TRUE, the extraction will only be simulated. + * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. + */ + int extractEnergy(int maxExtract, boolean simulate); - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(); + /** + * Returns the amount of energy currently stored. + */ + int getEnergyStored(); - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(); + /** + * Returns the maximum amount of energy that can be stored. + */ + int getMaxEnergyStored(); } diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java index 0fb36dab6..bdca3f0d5 100755 --- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java +++ b/src/main/java/cofh/api/energy/ItemEnergyContainer.java @@ -8,106 +8,105 @@ import net.minecraft.nbt.NBTTagCompound; * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own. * * @author King Lemming - * */ public class ItemEnergyContainer extends Item implements IEnergyContainerItem { - protected int capacity; - protected int maxReceive; - protected int maxExtract; + protected int capacity; + protected int maxReceive; + protected int maxExtract; - public ItemEnergyContainer() { + public ItemEnergyContainer() { - } + } - public ItemEnergyContainer(int capacity) { + public ItemEnergyContainer(int capacity) { - this(capacity, capacity, capacity); - } + this(capacity, capacity, capacity); + } - public ItemEnergyContainer(int capacity, int maxTransfer) { + public ItemEnergyContainer(int capacity, int maxTransfer) { - this(capacity, maxTransfer, maxTransfer); - } + this(capacity, maxTransfer, maxTransfer); + } - public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { + public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } + this.capacity = capacity; + this.maxReceive = maxReceive; + this.maxExtract = maxExtract; + } - public ItemEnergyContainer setCapacity(int capacity) { + public ItemEnergyContainer setCapacity(int capacity) { - this.capacity = capacity; - return this; - } + this.capacity = capacity; + return this; + } - public ItemEnergyContainer setMaxTransfer(int maxTransfer) { + public ItemEnergyContainer setMaxTransfer(int maxTransfer) { - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - return this; - } + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + return this; + } - public ItemEnergyContainer setMaxReceive(int maxReceive) { + public ItemEnergyContainer setMaxReceive(int maxReceive) { - this.maxReceive = maxReceive; - return this; - } + this.maxReceive = maxReceive; + return this; + } - public ItemEnergyContainer setMaxExtract(int maxExtract) { + public ItemEnergyContainer setMaxExtract(int maxExtract) { - this.maxExtract = maxExtract; - return this; - } + this.maxExtract = maxExtract; + return this; + } - /* IEnergyContainerItem */ - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + /* IEnergyContainerItem */ + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (!container.hasTagCompound()) { - container.setTagCompound(new NBTTagCompound()); - } - int energy = container.getTagCompound().getInteger("Energy"); - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); + if (!container.hasTagCompound()) { + container.setTagCompound(new NBTTagCompound()); + } + int energy = container.getTagCompound().getInteger("Energy"); + int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { - energy += energyReceived; - container.getTagCompound().setInteger("Energy", energy); - } - return energyReceived; - } + if (!simulate) { + energy += energyReceived; + container.getTagCompound().setInteger("Energy", energy); + } + return energyReceived; + } - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { - return 0; - } - int energy = container.getTagCompound().getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); + if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { + return 0; + } + int energy = container.getTagCompound().getInteger("Energy"); + int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { - energy -= energyExtracted; - container.getTagCompound().setInteger("Energy", energy); - } - return energyExtracted; - } + if (!simulate) { + energy -= energyExtracted; + container.getTagCompound().setInteger("Energy", energy); + } + return energyExtracted; + } - @Override - public int getEnergyStored(ItemStack container) { + @Override + public int getEnergyStored(ItemStack container) { - if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { - return 0; - } - return container.getTagCompound().getInteger("Energy"); - } + if (container.getTagCompound() == null || !container.getTagCompound().hasKey("Energy")) { + return 0; + } + return container.getTagCompound().getInteger("Energy"); + } - @Override - public int getMaxEnergyStored(ItemStack container) { + @Override + public int getMaxEnergyStored(ItemStack container) { - return capacity; - } + return capacity; + } } diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java index 3ba60a664..d45e9d0f0 100755 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/main/java/cofh/api/energy/TileEnergyHandler.java @@ -6,62 +6,61 @@ import net.minecraft.util.EnumFacing; /** * Reference implementation of {@link IEnergyReceiver} and {@link IEnergyProvider}. Use/extend this or implement your own. - * + *

* This class is really meant to summarize how each interface is properly used. * * @author King Lemming - * */ public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IEnergyProvider { - protected EnergyStorage storage = new EnergyStorage(32000); + protected EnergyStorage storage = new EnergyStorage(32000); - @Override - public void readFromNBT(NBTTagCompound nbt) { + @Override + public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - storage.readFromNBT(nbt); - } + super.readFromNBT(nbt); + storage.readFromNBT(nbt); + } - @Override - public void writeToNBT(NBTTagCompound nbt) { + @Override + public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - storage.writeToNBT(nbt); - } + super.writeToNBT(nbt); + storage.writeToNBT(nbt); + } - /* IEnergyConnection */ - @Override - public boolean canConnectEnergy(EnumFacing from) { + /* IEnergyConnection */ + @Override + public boolean canConnectEnergy(EnumFacing from) { - return true; - } + return true; + } - /* IEnergyReceiver */ - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { + /* IEnergyReceiver */ + @Override + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - return storage.receiveEnergy(maxReceive, simulate); - } + return storage.receiveEnergy(maxReceive, simulate); + } - /* IEnergyProvider */ - @Override - public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { + /* IEnergyProvider */ + @Override + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - return storage.extractEnergy(maxExtract, simulate); - } + return storage.extractEnergy(maxExtract, simulate); + } - /* IEnergyHandler */ - @Override - public int getEnergyStored(EnumFacing from) { + /* IEnergyHandler */ + @Override + public int getEnergyStored(EnumFacing from) { - return storage.getEnergyStored(); - } + return storage.getEnergyStored(); + } - @Override - public int getMaxEnergyStored(EnumFacing from) { + @Override + public int getMaxEnergyStored(EnumFacing from) { - return storage.getMaxEnergyStored(); - } + return storage.getMaxEnergyStored(); + } } diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java index da8566735..21dca2485 100755 --- a/src/main/java/cofh/api/energy/package-info.java +++ b/src/main/java/cofh/api/energy/package-info.java @@ -5,6 +5,6 @@ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") package cofh.api.energy; -import net.minecraftforge.fml.common.API; import cofh.api.CoFHAPIProps; +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java index 5d6642d4c..0b33ddb38 100755 --- a/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ b/src/main/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java @@ -2,8 +2,7 @@ package powercrystals.minefactoryreloaded.api; import net.minecraft.item.ItemStack; -public interface IDeepStorageUnit -{ +public interface IDeepStorageUnit { /** * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. May have a stackSize > getMaxStackSize(). */ diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index daf47921b..daf79e373 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockConstructor extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.CONSTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 230ff8258..9a96777a4 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockDestructor extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.DESTRUCTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 2b66772f7..4cc4c8f8d 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -66,7 +66,7 @@ public class BlockDetector extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.DETECTOR, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java index 72b7dca8f..39f435ded 100755 --- a/src/main/java/refinedstorage/block/BlockDiskDrive.java +++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockDiskDrive extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.DISK_DRIVE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java index 49f3ce855..f5a38c7d4 100755 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockExporter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.EXPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index 0fff22f58..f83d34e42 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockExternalStorage extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index 013d1a33f..1b124a629 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockImporter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.IMPORTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index 01260204d..cc5bf74ad 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockInterface extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.INTERFACE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 997af4011..3fdaee0a4 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -6,6 +6,7 @@ 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.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -22,7 +23,7 @@ public class BlockSolderer extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.SOLDERER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index f07ec7e23..c986505fe 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -65,7 +65,7 @@ public class BlockStorage extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.STORAGE, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index 179d80397..d7e17bd37 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -45,7 +45,7 @@ public class BlockWirelessTransmitter extends BlockMachine { } @Override - public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { + 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(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); } diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 581597533..3cfb316f9 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -1,6 +1,5 @@ package refinedstorage.gui; -import net.minecraft.inventory.Container; import refinedstorage.container.ContainerSolderer; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index 1b1ae37b3..c99927739 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -1,6 +1,5 @@ package refinedstorage.gui; -import net.minecraft.inventory.Container; import refinedstorage.container.ContainerWirelessTransmitter; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index afaafb19d..c83884244 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -21,6 +21,7 @@ import refinedstorage.network.*; import refinedstorage.storage.NBTStorage; import refinedstorage.tile.*; import refinedstorage.tile.solderer.*; + import static refinedstorage.RefinedStorage.ID; public class CommonProxy { diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index da0d91d09..f3261ef4c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -1,73 +1,75 @@ { - "forge_marker": 1, - "defaults": { - "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" - }, - "model": "refinedstorage:cable_core", - "uvlock": true - }, - "variants": { - "inventory": [{ - "model": "refinedstorage:cable", - "transform": "forge:default-block" - }], - "north": { - "true": { - "submodel": "refinedstorage:cable_north" - }, - "false": { - } - }, - "east": { - "true": { - "submodel": "refinedstorage:cable_east" - }, - "false": { - } - }, - "south": { - "true": { - "submodel": "refinedstorage:cable_south" - }, - "false": { - } - }, - "west": { - "true": { - "submodel": "refinedstorage:cable_west" - }, - "false": { - } - }, - "up": { - "true": { - "submodel": "refinedstorage:cable_up" - }, - "false": { - } - }, - "down": { - "true": { - "submodel": "refinedstorage:cable_down" - }, - "false": { - } - }, - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - } - } + "forge_marker": 1, + "defaults": { + "textures": { + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" + }, + "model": "refinedstorage:cable_core", + "uvlock": true + }, + "variants": { + "inventory": [ + { + "model": "refinedstorage:cable", + "transform": "forge:default-block" + } + ], + "north": { + "true": { + "submodel": "refinedstorage:cable_north" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_east" + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_south" + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_west" + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_up" + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_down" + }, + "false": { + } + }, + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 86a3dc400..0ba47c9b8 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block", - "textures": { - "front": "refinedstorage:blocks/constructor_disconnected" - } - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/constructor_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/constructor_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block", + "textures": { + "front": "refinedstorage:blocks/constructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/constructor_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/constructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json index f148cfbbf..081716e07 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -1,92 +1,92 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/controller_0" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "energy": { - "0": { - "textures": { - "front": "refinedstorage:blocks/controller_0" - } - }, - "1": { - "textures": { - "front": "refinedstorage:blocks/controller_1" - } - }, - "2": { - "textures": { - "front": "refinedstorage:blocks/controller_2" - } - }, - "3": { - "textures": { - "front": "refinedstorage:blocks/controller_3" - } - }, - "4": { - "textures": { - "front": "refinedstorage:blocks/controller_4" - } - }, - "5": { - "textures": { - "front": "refinedstorage:blocks/controller_5" - } - }, - "6": { - "textures": { - "front": "refinedstorage:blocks/controller_6" - } - }, - "7": { - "textures": { - "front": "refinedstorage:blocks/controller_7" - } - }, - "8": { - "textures": { - "front": "refinedstorage:blocks/controller_8" - } - } - }, - "type": { - "normal": { - }, - "creative": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/controller_0" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "energy": { + "0": { + "textures": { + "front": "refinedstorage:blocks/controller_0" + } + }, + "1": { + "textures": { + "front": "refinedstorage:blocks/controller_1" + } + }, + "2": { + "textures": { + "front": "refinedstorage:blocks/controller_2" + } + }, + "3": { + "textures": { + "front": "refinedstorage:blocks/controller_3" + } + }, + "4": { + "textures": { + "front": "refinedstorage:blocks/controller_4" + } + }, + "5": { + "textures": { + "front": "refinedstorage:blocks/controller_5" + } + }, + "6": { + "textures": { + "front": "refinedstorage:blocks/controller_6" + } + }, + "7": { + "textures": { + "front": "refinedstorage:blocks/controller_7" + } + }, + "8": { + "textures": { + "front": "refinedstorage:blocks/controller_8" + } + } + }, + "type": { + "normal": { + }, + "creative": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index e947cc052..9fc7adc9c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block", - "textures": { - "front": "refinedstorage:blocks/destructor_disconnected" - } - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/destructor_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/destructor_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block", + "textures": { + "front": "refinedstorage:blocks/destructor_disconnected" + } + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/destructor_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/destructor_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index d1c62d543..77f3ea633 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -1,54 +1,54 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/detector_unpowered" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "powered": { - "true": { - "textures": { - "front": "refinedstorage:blocks/detector_powered" - } - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/detector_unpowered" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "powered": { + "true": { + "textures": { + "front": "refinedstorage:blocks/detector_powered" + } + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json index 2c84db2ba..fdbb245a2 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/disk_drive" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block", - "y": 0 - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/disk_drive" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block", + "y": 0 + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 3e97ab4d9..8fef98a80 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/exporter" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/exporter" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 6b891d4ee..56d8e97b7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/external_storage" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/external_storage" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index 578d68dd0..45b48a2ad 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -1,59 +1,59 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - }, - "transform": "forge:default-block", - "y": 0 - } - ], - "type": { - "normal": { - }, - "crafting": { - } - }, - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/grid_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "textures": { + "front": "refinedstorage:blocks/grid_disconnected" + }, + "transform": "forge:default-block", + "y": 0 + } + ], + "type": { + "normal": { + }, + "crafting": { + } + }, + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/grid_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/grid_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index 88a844591..78a57739e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -1,45 +1,45 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/importer" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/importer" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/interface.json b/src/main/resources/assets/refinedstorage/blockstates/interface.json index 212f79249..7e5023f77 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/interface.json +++ b/src/main/resources/assets/refinedstorage/blockstates/interface.json @@ -1,36 +1,36 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/interface" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - }, - "connected": { - "true": { - }, - "false": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/interface" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + }, + "connected": { + "true": { + }, + "false": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json index 243b9a488..00c5b91bd 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json +++ b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json @@ -1,30 +1,30 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay.json b/src/main/resources/assets/refinedstorage/blockstates/relay.json index 5aeb8a774..af77013e8 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/relay.json +++ b/src/main/resources/assets/refinedstorage/blockstates/relay.json @@ -1,39 +1,39 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "textures": { - "all": "refinedstorage:blocks/relay_connected" - } - }, - "variants": { - "inventory": [ - { - "transform": "forge:default-block" - } - ], - "direction": { - "north": { - }, - "east": { - }, - "south": { - }, - "west": { - }, - "up": { - }, - "down": { - } - }, - "connected": { - "true": { - }, - "false": { - "textures": { - "all": "refinedstorage:blocks/relay_disconnected" - } - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/relay_connected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "direction": { + "north": { + }, + "east": { + }, + "south": { + }, + "west": { + }, + "up": { + }, + "down": { + } + }, + "connected": { + "true": { + }, + "false": { + "textures": { + "all": "refinedstorage:blocks/relay_disconnected" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index d2f88bdf8..f5575de5e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -1,53 +1,53 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "textures": { - "front": "refinedstorage:blocks/solderer_disconnected" - }, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/solderer_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/solderer_disconnected" - } - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "textures": { + "front": "refinedstorage:blocks/solderer_disconnected" + }, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/solderer_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/solderer_disconnected" + } + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage.json b/src/main/resources/assets/refinedstorage/blockstates/storage.json index 3104f7dea..9d6bc5795 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage.json @@ -1,36 +1,36 @@ { - "forge_marker": 1, - "defaults": { - "model": "cube_all", - "transform": "forge:default-block" - }, - "variants": { - "type": { - "1k": { - "textures": { - "all": "refinedstorage:blocks/1k_storage_block" - } - }, - "4k": { - "textures": { - "all": "refinedstorage:blocks/4k_storage_block" - } - }, - "16k": { - "textures": { - "all": "refinedstorage:blocks/16k_storage_block" - } - }, - "64k": { - "textures": { - "all": "refinedstorage:blocks/64k_storage_block" - } - }, - "creative": { - "textures": { - "all": "refinedstorage:blocks/creative_storage_block" - } - } - } - } + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "type": { + "1k": { + "textures": { + "all": "refinedstorage:blocks/1k_storage_block" + } + }, + "4k": { + "textures": { + "all": "refinedstorage:blocks/4k_storage_block" + } + }, + "16k": { + "textures": { + "all": "refinedstorage:blocks/16k_storage_block" + } + }, + "64k": { + "textures": { + "all": "refinedstorage:blocks/64k_storage_block" + } + }, + "creative": { + "textures": { + "all": "refinedstorage:blocks/creative_storage_block" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json index 83c6efba5..a249b0c7d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -1,56 +1,56 @@ { - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side", - "top": "refinedstorage:blocks/wireless_transmitter_side", - "front": "refinedstorage:blocks/wireless_transmitter" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - }, - "working": { - "true": { - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side_working", - "top": "refinedstorage:blocks/wireless_transmitter_side_working", - "front": "refinedstorage:blocks/wireless_transmitter_working" - } - }, - "false": { - } - } - } + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/wireless_transmitter_side", + "top": "refinedstorage:blocks/wireless_transmitter_side", + "front": "refinedstorage:blocks/wireless_transmitter" + } + }, + "variants": { + "inventory": [ + { + "y": 0, + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + }, + "false": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + }, + "working": { + "true": { + "textures": { + "side": "refinedstorage:blocks/wireless_transmitter_side_working", + "top": "refinedstorage:blocks/wireless_transmitter_side_working", + "front": "refinedstorage:blocks/wireless_transmitter_working" + } + }, + "false": { + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json index 049952da6..3170aa97d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable.json @@ -1,98 +1,212 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Core", - "from": [6.0, 6.0, 6.0], - "to": [10.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - }, - { - "name": "East", - "from": [10.0, 6.0, 6.0], - "to": [16.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - }, - { - "name": "West", - "from": [0.0, 6.0, 6.0], - "to": [6.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "East", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 16.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "West", + "from": [ + 0.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json index 7fca82c2c..9f9d5149d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_core.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_core.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Core", - "from": [6.0, 6.0, 6.0], - "to": [10.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json index 29b512eb5..b6751c24f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_down.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Down", - "from": [6.0, 0.0, 6.0], - "to": [10.0, 6.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Down", + "from": [ + 6.0, + 0.0, + 6.0 + ], + "to": [ + 10.0, + 6.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json index 10aad3374..52ab45d9d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_east.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "East", - "from": [10.0, 6.0, 6.0], - "to": [16.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "East", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 16.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json index db2875e5e..8ea78cadb 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_north.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "North", - "from": [6.0, 6.0, 0.0], - "to": [10.0, 10.0, 6.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "North", + "from": [ + 6.0, + 6.0, + 0.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json index 9dbd6a5b5..ade8e334a 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_south.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "South", - "from": [6.0, 6.0, 10.0], - "to": [10.0, 10.0, 16.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "South", + "from": [ + 6.0, + 6.0, + 10.0 + ], + "to": [ + 10.0, + 10.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json index ddddd6029..deddf2228 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_up.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Up", - "from": [6.0, 10.0, 6.0], - "to": [10.0, 16.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Up", + "from": [ + 6.0, + 10.0, + 6.0 + ], + "to": [ + 10.0, + 16.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json index 46b37e739..49d4b478c 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_west.json @@ -1,36 +1,74 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "West", - "from": [0.0, 6.0, 6.0], - "to": [6.0, 10.0, 10.0], - "faces": { - "north": { - "texture": "#all", - "uv": [4.0, 4.0, 8.0, 8.0] - }, - "east": { - "texture": "#all", - "uv": [0.0, 4.0, 4.0, 8.0] - }, - "south": { - "texture": "#all", - "uv": [12.0, 4.0, 16.0, 8.0] - }, - "west": { - "texture": "#all", - "uv": [8.0, 4.0, 12.0, 8.0] - }, - "up": { - "texture": "#all", - "uv": [8.0, 4.0, 4.0, 0.0] - }, - "down": { - "texture": "#all", - "uv": [12.0, 0.0, 8.0, 4.0] - } - } - } - ] + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "West", + "from": [ + 0.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json index 376f90061..d3ba63db3 100755 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json index 6e5519a16..e630fcf4c 100755 --- a/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/16k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/16k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/16k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json index c44af3b43..4e88445ef 100755 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/1k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json index 09e84303c..ced967a21 100755 --- a/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/1k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/1k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/1k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json index 860a01e61..6989f65dd 100755 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/4k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/4k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json index 9e293d54f..604dfb96e 100755 --- a/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/4k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/4k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/4k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json index e946fe259..08037e6fe 100755 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json index 6bca83069..b5814de24 100755 --- a/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json +++ b/src/main/resources/assets/refinedstorage/models/item/64k_storage_part.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/64k_storage_part" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_storage_part" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json index c2d3ba27e..075924901 100755 --- a/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/advanced_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json index 93ce71e7d..43f5a4e2f 100755 --- a/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/advanced_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/advanced_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/advanced_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json index 30cd2ee78..10fa74269 100755 --- a/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/basic_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/basic_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/basic_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/basic_processor.json b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json index 76ca670d3..607a63c96 100755 --- a/src/main/resources/assets/refinedstorage/models/item/basic_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/basic_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/basic_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/basic_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/construction_core.json b/src/main/resources/assets/refinedstorage/models/item/construction_core.json index 8d7d69455..9d82ab680 100755 --- a/src/main/resources/assets/refinedstorage/models/item/construction_core.json +++ b/src/main/resources/assets/refinedstorage/models/item/construction_core.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/construction_core" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/construction_core" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json index bc65d8493..4969e9812 100755 --- a/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json +++ b/src/main/resources/assets/refinedstorage/models/item/creative_storage_disk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/creative_storage_disk" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/creative_storage_disk" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json index c58e13661..da9c5d468 100755 --- a/src/main/resources/assets/refinedstorage/models/item/destruction_core.json +++ b/src/main/resources/assets/refinedstorage/models/item/destruction_core.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/destruction_core" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/destruction_core" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json index 6422d750d..53286c3d8 100755 --- a/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/improved_printed_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/improved_printed_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_printed_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json index a76b43436..5dedd64a2 100755 --- a/src/main/resources/assets/refinedstorage/models/item/improved_processor.json +++ b/src/main/resources/assets/refinedstorage/models/item/improved_processor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/improved_processor" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/improved_processor" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json index 69a3b0a89..c957cf777 100755 --- a/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/printed_silicon.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/printed_silicon" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/printed_silicon" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json index 688321cf7..af0f60dc7 100755 --- a/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json +++ b/src/main/resources/assets/refinedstorage/models/item/quartz_enriched_iron.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/quartz_enriched_iron" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/quartz_enriched_iron" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/silicon.json b/src/main/resources/assets/refinedstorage/models/item/silicon.json index 091538c0d..d42af72c2 100755 --- a/src/main/resources/assets/refinedstorage/models/item/silicon.json +++ b/src/main/resources/assets/refinedstorage/models/item/silicon.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/silicon" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/silicon" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json index 73cacbc69..13d27aa4d 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_connected.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_connected" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_connected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json index 7cc6fc397..bae0192fb 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_disconnected.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_disconnected" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_disconnected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json index 08fb6203a..0bf6eaedc 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_plate" - } + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/wireless_grid_plate" + } } From af4f3e8b40b4f1aeaad36a472780fbc1085b4507 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 18:55:18 +0100 Subject: [PATCH 13/76] Machines don't NEED to be connected with cables anymore (they can be next to each other) --- .../java/refinedstorage/block/BlockCable.java | 38 ++++++----- .../refinedstorage/proxy/CommonProxy.java | 1 - .../refinedstorage/tile/MachineSearcher.java | 47 ++++++++++++++ .../java/refinedstorage/tile/TileCable.java | 64 ------------------- .../refinedstorage/tile/TileController.java | 10 +-- 5 files changed, 71 insertions(+), 89 deletions(-) create mode 100755 src/main/java/refinedstorage/tile/MachineSearcher.java delete mode 100755 src/main/java/refinedstorage/tile/TileCable.java diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index a470d8704..2aa216733 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -1,5 +1,6 @@ package refinedstorage.block; +import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; @@ -9,7 +10,8 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import refinedstorage.tile.TileCable; +import refinedstorage.tile.TileController; +import refinedstorage.tile.TileMachine; public class BlockCable extends BlockBase { public static final PropertyBool NORTH = PropertyBool.create("north"); @@ -40,12 +42,24 @@ public class BlockCable extends BlockBase { @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { return super.getActualState(state, world, pos) - .withProperty(NORTH, TileCable.hasConnectionWith(world, pos.north())) - .withProperty(EAST, TileCable.hasConnectionWith(world, pos.east())) - .withProperty(SOUTH, TileCable.hasConnectionWith(world, pos.south())) - .withProperty(WEST, TileCable.hasConnectionWith(world, pos.west())) - .withProperty(UP, TileCable.hasConnectionWith(world, pos.up())) - .withProperty(DOWN, TileCable.hasConnectionWith(world, pos.down())); + .withProperty(NORTH, hasConnectionWith(world, pos.north())) + .withProperty(EAST, hasConnectionWith(world, pos.east())) + .withProperty(SOUTH, hasConnectionWith(world, pos.south())) + .withProperty(WEST, hasConnectionWith(world, pos.west())) + .withProperty(UP, hasConnectionWith(world, pos.up())) + .withProperty(DOWN, hasConnectionWith(world, pos.down())); + } + + public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { + Block block = world.getBlockState(pos).getBlock(); + + if (block instanceof BlockCable) { + return true; + } + + TileEntity tile = world.getTileEntity(pos); + + return tile instanceof TileMachine || tile instanceof TileController; } @Override @@ -60,16 +74,6 @@ public class BlockCable extends BlockBase { return getBoundingBox(state, world, pos); } - @Override - public boolean hasTileEntity(IBlockState state) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileCable(); - } - @Override public boolean isOpaqueCube(IBlockState state) { return false; diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index c83884244..a39b8e253 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -42,7 +42,6 @@ public class CommonProxy { NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); GameRegistry.registerTileEntity(TileController.class, ID + ":controller"); - GameRegistry.registerTileEntity(TileCable.class, ID + ":cable"); GameRegistry.registerTileEntity(TileGrid.class, ID + ":grid"); GameRegistry.registerTileEntity(TileDiskDrive.class, ID + ":disk_drive"); GameRegistry.registerTileEntity(TileExternalStorage.class, ID + ":external_storage"); diff --git a/src/main/java/refinedstorage/tile/MachineSearcher.java b/src/main/java/refinedstorage/tile/MachineSearcher.java new file mode 100755 index 000000000..721c45357 --- /dev/null +++ b/src/main/java/refinedstorage/tile/MachineSearcher.java @@ -0,0 +1,47 @@ +package refinedstorage.tile; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import refinedstorage.RefinedStorageBlocks; + +import java.util.List; + +public class MachineSearcher { + public static void search(TileController controller, BlockPos current, List visited, List machines) { + for (BlockPos visit : visited) { + if (visit.equals(current) || controller.getPos().equals(current)) { + return; + } + } + + visited.add(current); + + Block block = controller.getWorld().getBlockState(current).getBlock(); + TileEntity tile = controller.getWorld().getTileEntity(current); + + if (tile instanceof TileController) { + if (!tile.getPos().equals(controller.getPos())) { + controller.getWorld().createExplosion(null, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ(), 4.5f, true); + } + } + + if (tile instanceof TileMachine) { + TileMachine machine = (TileMachine) tile; + + if (machine.getRedstoneMode().isEnabled(controller.getWorld(), tile.getPos())) { + machines.add(machine); + } else if (machine instanceof TileRelay) { + // If the relay is disabled we can't search any further + return; + } + } + + if (tile instanceof TileMachine || block == RefinedStorageBlocks.CABLE) { + for (EnumFacing dir : EnumFacing.VALUES) { + search(controller, current.offset(dir), visited, machines); + } + } + } +} diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java deleted file mode 100755 index 6bdbd3e9f..000000000 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ /dev/null @@ -1,64 +0,0 @@ -package refinedstorage.tile; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -import java.util.List; - -public class TileCable extends TileBase { - public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - - return tile instanceof TileCable || tile instanceof TileMachine || tile instanceof TileController; - } - - public void addMachines(List visited, List machines, TileController controller) { - for (BlockPos visitedBlock : visited) { - if (visitedBlock.equals(pos)) { - return; - } - } - - visited.add(pos); - - for (EnumFacing dir : EnumFacing.VALUES) { - BlockPos newPos = pos.offset(dir); - - boolean alreadyVisited = false; - - for (BlockPos visitedBlock : visited) { - if (visitedBlock.equals(newPos)) { - alreadyVisited = true; - } - } - - if (alreadyVisited) { - continue; - } - - TileEntity tile = worldObj.getTileEntity(newPos); - - if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) { - machines.add((TileMachine) tile); - - visited.add(newPos); - - if (tile instanceof TileRelay) { - for (EnumFacing relayDir : EnumFacing.VALUES) { - TileEntity nextToRelay = worldObj.getTileEntity(newPos.offset(relayDir)); - - if (nextToRelay instanceof TileCable) { - ((TileCable) nextToRelay).addMachines(visited, machines, controller); - } - } - } - } else if (tile instanceof TileCable) { - ((TileCable) tile).addMachines(visited, machines, controller); - } else if (tile instanceof TileController && !controller.getPos().equals(newPos)) { - worldObj.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.5f, true); - } - } - } -} diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 051f98f25..f00bf0f06 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -30,7 +30,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor private List machines = new ArrayList(); - private List visitedCables = new ArrayList(); + private List visited = new ArrayList(); private EnergyStorage energy = new EnergyStorage(32000); private int energyUsage; @@ -52,16 +52,12 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!isActive()) { disconnectAll(); } else { - visitedCables.clear(); + visited.clear(); List newMachines = new ArrayList(); for (EnumFacing dir : EnumFacing.VALUES) { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); - - if (tile instanceof TileCable) { - ((TileCable) tile).addMachines(visitedCables, newMachines, this); - } + MachineSearcher.search(this, pos.offset(dir), visited, newMachines); } for (TileMachine machine : machines) { From 69048d35fb882d6004f6d90a6d93f972fc32e9da Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 20:23:54 +0100 Subject: [PATCH 14/76] Use hopper logic for exporter. --- .../refinedstorage/tile/TileExporter.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 208e1b05b..9b6b0d2c1 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -2,10 +2,10 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityHopper; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; @@ -41,28 +41,10 @@ public class TileExporter extends TileMachine implements ICompareSetting { ItemStack took = getController().take(toTake, compare); if (took != null) { - if (connectedInventory instanceof ISidedInventory) { - ISidedInventory sided = (ISidedInventory) connectedInventory; + ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots(connectedInventory, took, getDirection().getOpposite()); - boolean pushedAny = false; - - for (int sidedSlot = 0; sidedSlot < connectedInventory.getSizeInventory(); ++sidedSlot) { - if (sided.canInsertItem(sidedSlot, took, getDirection().getOpposite()) && InventoryUtils.canPushToInventorySlot(connectedInventory, sidedSlot, took)) { - InventoryUtils.pushToInventorySlot(connectedInventory, sidedSlot, took); - - pushedAny = true; - - break; - } - } - - if (!pushedAny) { - getController().push(took); - } - } else if (InventoryUtils.canPushToInventory(connectedInventory, took)) { - InventoryUtils.pushToInventory(connectedInventory, took); - } else { - getController().push(took); + if (remaining != null) { + getController().push(remaining); } } } From d1cd667f4898b0fb235afddce5f213f1dbb0676a Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Fri, 25 Mar 2016 20:54:25 +0100 Subject: [PATCH 15/76] draw item overlay scaled --- src/main/java/refinedstorage/gui/GuiBase.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 6fcdc1e16..40c137eae 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -161,13 +161,35 @@ public abstract class GuiBase extends GuiContainer { itemRender.renderItemIntoGUI(stack, x, y); if (withOverlay) { - itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); - } + renderSlotOverlay(stack, message,x,y); + } zLevel = 0.0F; itemRender.zLevel = 0.0F; } + private void renderSlotOverlay(ItemStack stack, String text, int x, int y) { + if (text != null) { + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, 1); + GL11.glScalef(0.5f, 0.5f, 1); + + int stringWidth = fontRendererObj.getStringWidth(text); + GlStateManager.disableLighting(); + GlStateManager.disableRescaleNormal(); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); + GlStateManager.disableDepth(); + fontRendererObj.drawString(text, 30-stringWidth, 22, 16777215); + GlStateManager.enableDepth(); + GlStateManager.enableTexture2D(); + GlStateManager.depthMask(true); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + } public void drawString(int x, int y, String message) { drawString(x, y, message, 4210752); } From 2ec0ec562929c16111f89576bb7c30160b85eb9b Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Fri, 25 Mar 2016 21:22:25 +0100 Subject: [PATCH 16/76] render damage bar if needed --- src/main/java/refinedstorage/gui/GuiBase.java | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 40c137eae..1ee28bec8 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -1,11 +1,18 @@ package refinedstorage.gui; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import refinedstorage.RefinedStorage; @@ -161,7 +168,7 @@ public abstract class GuiBase extends GuiContainer { itemRender.renderItemIntoGUI(stack, x, y); if (withOverlay) { - renderSlotOverlay(stack, message,x,y); + renderSlotOverlay(stack, message,x,y); } zLevel = 0.0F; @@ -185,11 +192,63 @@ public abstract class GuiBase extends GuiContainer { GlStateManager.enableDepth(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); - GlStateManager.enableLighting(); + GlStateManager.enableLighting(); GlStateManager.disableBlend(); GlStateManager.popMatrix(); - } - } + + } + + if (stack.getItem().showDurabilityBar(stack)) + { + double health = stack.getItem().getDurabilityForDisplay(stack); + int j = (int)Math.round(13.0D - health * 13.0D); + int i = (int)Math.round(255.0D - health * 255.0D); + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.disableTexture2D(); + GlStateManager.disableAlpha(); + GlStateManager.disableBlend(); + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer vertexbuffer = tessellator.getBuffer(); + this.draw(vertexbuffer, x + 2, y + 13, 13, 2, 0, 0, 0, 255); + this.draw(vertexbuffer, x + 2, y + 13, 12, 1, (255 - i) / 4, 64, 0, 255); + this.draw(vertexbuffer, x + 2, y + 13, j, 1, 255 - i, i, 0, 255); + //GlStateManager.enableBlend(); // Forge: Disable Blend because it screws with a lot of things down the line. + GlStateManager.enableAlpha(); + GlStateManager.enableTexture2D(); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); + } + + EntityPlayerSP entityplayersp = Minecraft.getMinecraft().thePlayer; + float f = entityplayersp == null ? 0.0F : entityplayersp.getCooldownTracker().getCooldown(stack.getItem(), Minecraft.getMinecraft().getRenderPartialTicks()); + + if (f > 0.0F) + { + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + GlStateManager.disableTexture2D(); + Tessellator tessellator1 = Tessellator.getInstance(); + VertexBuffer vertexbuffer1 = tessellator1.getBuffer(); + this.draw(vertexbuffer1, x, y + MathHelper.floor_float(16.0F * (1.0F - f)), 16, MathHelper.ceiling_float_int(16.0F * f), 255, 255, 255, 127); + GlStateManager.enableTexture2D(); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); + } + + + } + + private void draw(VertexBuffer renderer, int x, int y, int width, int height, int red, int green, int blue, int alpha) + { + renderer.begin(7, DefaultVertexFormats.POSITION_COLOR); + renderer.pos((double)(x + 0), (double)(y + 0), 0.0D).color(red, green, blue, alpha).endVertex(); + renderer.pos((double)(x + 0), (double)(y + height), 0.0D).color(red, green, blue, alpha).endVertex(); + renderer.pos((double)(x + width), (double)(y + height), 0.0D).color(red, green, blue, alpha).endVertex(); + renderer.pos((double)(x + width), (double)(y + 0), 0.0D).color(red, green, blue, alpha).endVertex(); + Tessellator.getInstance().draw(); + } + public void drawString(int x, int y, String message) { drawString(x, y, message, 4210752); } From a9b243e67ff87740acfe74c9a173cf65efb993fc Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Fri, 25 Mar 2016 21:31:42 +0100 Subject: [PATCH 17/76] shadow on text, use builtin function for damagebar --- src/main/java/refinedstorage/gui/GuiBase.java | 44 ++----------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 1ee28bec8..65de345be 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -188,7 +188,7 @@ public abstract class GuiBase extends GuiContainer { GlStateManager.enableBlend(); GlStateManager.blendFunc(770, 771); GlStateManager.disableDepth(); - fontRendererObj.drawString(text, 30-stringWidth, 22, 16777215); + fontRendererObj.drawStringWithShadow(text, 30-stringWidth, 22, 16777215); GlStateManager.enableDepth(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); @@ -197,46 +197,8 @@ public abstract class GuiBase extends GuiContainer { GlStateManager.popMatrix(); } - - if (stack.getItem().showDurabilityBar(stack)) - { - double health = stack.getItem().getDurabilityForDisplay(stack); - int j = (int)Math.round(13.0D - health * 13.0D); - int i = (int)Math.round(255.0D - health * 255.0D); - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - GlStateManager.disableTexture2D(); - GlStateManager.disableAlpha(); - GlStateManager.disableBlend(); - Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexbuffer = tessellator.getBuffer(); - this.draw(vertexbuffer, x + 2, y + 13, 13, 2, 0, 0, 0, 255); - this.draw(vertexbuffer, x + 2, y + 13, 12, 1, (255 - i) / 4, 64, 0, 255); - this.draw(vertexbuffer, x + 2, y + 13, j, 1, 255 - i, i, 0, 255); - //GlStateManager.enableBlend(); // Forge: Disable Blend because it screws with a lot of things down the line. - GlStateManager.enableAlpha(); - GlStateManager.enableTexture2D(); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); - } - - EntityPlayerSP entityplayersp = Minecraft.getMinecraft().thePlayer; - float f = entityplayersp == null ? 0.0F : entityplayersp.getCooldownTracker().getCooldown(stack.getItem(), Minecraft.getMinecraft().getRenderPartialTicks()); - - if (f > 0.0F) - { - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - GlStateManager.disableTexture2D(); - Tessellator tessellator1 = Tessellator.getInstance(); - VertexBuffer vertexbuffer1 = tessellator1.getBuffer(); - this.draw(vertexbuffer1, x, y + MathHelper.floor_float(16.0F * (1.0F - f)), 16, MathHelper.ceiling_float_int(16.0F * f), 255, 255, 255, 127); - GlStateManager.enableTexture2D(); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); - } - - + + itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); } private void draw(VertexBuffer renderer, int x, int y, int width, int height, int red, int green, int blue, int alpha) From ff6d35b5065219236da762376fa0926938bb0526 Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Fri, 25 Mar 2016 21:34:03 +0100 Subject: [PATCH 18/76] remove unused draw function --- src/main/java/refinedstorage/gui/GuiBase.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 65de345be..83c3b281d 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -201,16 +201,6 @@ public abstract class GuiBase extends GuiContainer { itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); } - private void draw(VertexBuffer renderer, int x, int y, int width, int height, int red, int green, int blue, int alpha) - { - renderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - renderer.pos((double)(x + 0), (double)(y + 0), 0.0D).color(red, green, blue, alpha).endVertex(); - renderer.pos((double)(x + 0), (double)(y + height), 0.0D).color(red, green, blue, alpha).endVertex(); - renderer.pos((double)(x + width), (double)(y + height), 0.0D).color(red, green, blue, alpha).endVertex(); - renderer.pos((double)(x + width), (double)(y + 0), 0.0D).color(red, green, blue, alpha).endVertex(); - Tessellator.getInstance().draw(); - } - public void drawString(int x, int y, String message) { drawString(x, y, message, 4210752); } From a15ff8c41f42ef1405a5fdadce28e5190e8b5f33 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 21:51:01 +0100 Subject: [PATCH 19/76] Fixes --- src/main/java/refinedstorage/gui/GuiBase.java | 71 ++++++++----------- 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 83c3b281d..239ee6099 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -1,18 +1,11 @@ package refinedstorage.gui; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.translation.I18n; import org.lwjgl.opengl.GL11; import refinedstorage.RefinedStorage; @@ -155,52 +148,44 @@ public abstract class GuiBase extends GuiContainer { zLevel = 200.0F; itemRender.zLevel = 200.0F; - FontRenderer font = null; - - if (stack != null) { - font = stack.getItem().getFontRenderer(stack); - } - - if (font == null) { - font = fontRendererObj; - } - itemRender.renderItemIntoGUI(stack, x, y); if (withOverlay) { - renderSlotOverlay(stack, message,x,y); - } + drawItemOverlay(stack, message, x, y); + } zLevel = 0.0F; itemRender.zLevel = 0.0F; } - private void renderSlotOverlay(ItemStack stack, String text, int x, int y) { - if (text != null) { - GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, 1); - GL11.glScalef(0.5f, 0.5f, 1); + public void drawItemOverlay(ItemStack stack, String text, int x, int y) { + if (text != null) { + GlStateManager.pushMatrix(); + GlStateManager.translate(x, y, 1); + GL11.glScalef(0.5f, 0.5f, 1); - int stringWidth = fontRendererObj.getStringWidth(text); - GlStateManager.disableLighting(); - GlStateManager.disableRescaleNormal(); - GlStateManager.depthMask(false); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(770, 771); - GlStateManager.disableDepth(); - fontRendererObj.drawStringWithShadow(text, 30-stringWidth, 22, 16777215); - GlStateManager.enableDepth(); - GlStateManager.enableTexture2D(); - GlStateManager.depthMask(true); - GlStateManager.enableLighting(); - GlStateManager.disableBlend(); - GlStateManager.popMatrix(); - - } - - itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); + int stringWidth = fontRendererObj.getStringWidth(text); + + GlStateManager.disableLighting(); + GlStateManager.disableRescaleNormal(); + GlStateManager.depthMask(false); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); + GlStateManager.disableDepth(); + + fontRendererObj.drawStringWithShadow(text, 30 - stringWidth, 22, 16777215); + + GlStateManager.enableDepth(); + GlStateManager.enableTexture2D(); + GlStateManager.depthMask(true); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + } + + itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); } - + public void drawString(int x, int y, String message) { drawString(x, y, message, 4210752); } From 28812b2391ff4e337ac0073bad7ccb9a72547ac7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 22:07:24 +0100 Subject: [PATCH 20/76] Display after decimal point on big amounts --- src/main/java/refinedstorage/gui/GuiGrid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 1d946f1e2..3efbecce1 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -143,9 +143,9 @@ public class GuiGrid extends GuiBase { String text; if (qty >= 1000000) { - text = String.valueOf((int) Math.floor(qty / 1000000)) + "M"; + text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; } else if (qty >= 1000) { - text = String.valueOf((int) Math.floor(qty / 1000)) + "K"; + text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; } else if (qty == 1) { text = null; } else { From 3ae02290c58d53d2179342178c972bf10e81ad32 Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Fri, 25 Mar 2016 22:11:27 +0100 Subject: [PATCH 21/76] Smaller text in controller (machine list) removed tooltip --- .../refinedstorage/gui/GuiController.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index bb579f6ff..6348ade60 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -2,6 +2,7 @@ package refinedstorage.gui; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import refinedstorage.container.ContainerController; @@ -48,6 +49,13 @@ public class GuiController extends GuiBase { scrollbar.draw(this); } + private int calculateOffsetOnScale(int pos ,float scale) + { + float multiplier = (pos / scale); + return (int)multiplier; + + } + @Override public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); @@ -76,8 +84,14 @@ public class GuiController extends GuiBase { hoveringMachineStack = machineStack; } - drawItem(x, y, machineStack); - drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); + drawItem(x, y+5, machineStack); + GlStateManager.pushMatrix(); + float scale = 0.5f; + + GlStateManager.scale(scale,scale,1); + drawString(calculateOffsetOnScale(x+1,scale) , calculateOffsetOnScale(y-3,scale), machineStack.getDisplayName()); + drawString(calculateOffsetOnScale(x+21,scale), calculateOffsetOnScale(y+10,scale),t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); + GlStateManager.popMatrix(); } if (i == 1) { @@ -90,10 +104,13 @@ public class GuiController extends GuiBase { slot++; } - if (hoveringMachineStack != null) { + /* Not needed? + if (hoveringMachineStack != null) { + drawTooltip(mouseX, mouseY, hoveringMachineStack); } - + */ + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } From 002b5c0dda19a3eb8bfddf2cc6182cbdc1b9bbee Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 22:22:31 +0100 Subject: [PATCH 22/76] Code style fixes --- .../refinedstorage/gui/GuiController.java | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 6348ade60..f85cd9d55 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -49,13 +49,11 @@ public class GuiController extends GuiBase { scrollbar.draw(this); } - private int calculateOffsetOnScale(int pos ,float scale) - { - float multiplier = (pos / scale); - return (int)multiplier; - + private int calculateOffsetOnScale(int pos, float scale) { + float multiplier = (pos / scale); + return (int) multiplier; } - + @Override public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); @@ -70,8 +68,6 @@ public class GuiController extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); - ItemStack hoveringMachineStack = null; - for (int i = 0; i < 4; ++i) { if (slot < controller.getMachines().size()) { TileMachine machine = controller.getMachines().get(slot); @@ -80,17 +76,13 @@ public class GuiController extends GuiBase { ItemStack machineStack = new ItemStack(machineBlock, 1, machineBlock.getMetaFromState(machineState)); - if (inBounds(x, y, 16, 16, mouseX, mouseY)) { - hoveringMachineStack = machineStack; - } - - drawItem(x, y+5, machineStack); + drawItem(x, y + 5, machineStack); GlStateManager.pushMatrix(); float scale = 0.5f; - - GlStateManager.scale(scale,scale,1); - drawString(calculateOffsetOnScale(x+1,scale) , calculateOffsetOnScale(y-3,scale), machineStack.getDisplayName()); - drawString(calculateOffsetOnScale(x+21,scale), calculateOffsetOnScale(y+10,scale),t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); + + GlStateManager.scale(scale, scale, 1); + drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 3, scale), machineStack.getDisplayName()); + drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); GlStateManager.popMatrix(); } @@ -104,13 +96,6 @@ public class GuiController extends GuiBase { slot++; } - /* Not needed? - if (hoveringMachineStack != null) { - - drawTooltip(mouseX, mouseY, hoveringMachineStack); - } - */ - if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } From 5e83b1ef8f841be83357905edf1aef7a8be2fc68 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 23:20:12 +0100 Subject: [PATCH 23/76] Fix #6 --- .../refinedstorage/tile/TileController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index f00bf0f06..20aefa8d4 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -90,21 +90,21 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor }); syncItems(); - } - energyUsage = 10; + energyUsage = 10; - for (TileMachine machine : machines) { - energyUsage += machine.getEnergyUsage(); - } + for (TileMachine machine : machines) { + energyUsage += machine.getEnergyUsage(); + } - switch (getType()) { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } } if (lastEnergy != energy.getEnergyStored()) { From 307205359eb75d4ae8d5a7b7702ae2913ab60fdc Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 23:23:01 +0100 Subject: [PATCH 24/76] Make the energy draw actual RF/t --- .../refinedstorage/tile/TileController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 20aefa8d4..1b983c46e 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -48,6 +48,15 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!worldObj.isRemote) { int lastEnergy = energy.getEnergyStored(); + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } + if (ticks % 20 == 0) { if (!isActive()) { disconnectAll(); @@ -96,15 +105,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor for (TileMachine machine : machines) { energyUsage += machine.getEnergyUsage(); } - - switch (getType()) { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } } if (lastEnergy != energy.getEnergyStored()) { From 45476cda1d0210b6b0c04eea88bb11b3924c6e97 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 23:24:38 +0100 Subject: [PATCH 25/76] Fix order --- .../refinedstorage/tile/TileController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 1b983c46e..10934912b 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -48,15 +48,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!worldObj.isRemote) { int lastEnergy = energy.getEnergyStored(); - switch (getType()) { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } - if (ticks % 20 == 0) { if (!isActive()) { disconnectAll(); @@ -107,6 +98,15 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor } } + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } + if (lastEnergy != energy.getEnergyStored()) { worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); } From aace77d6159e7c17ea7d1fec18df97ac0d68ca8a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 25 Mar 2016 23:40:58 +0100 Subject: [PATCH 26/76] Shift clicking from grid crafting --- .../container/ContainerGrid.java | 15 ++++- src/main/java/refinedstorage/gui/GuiGrid.java | 10 +++ .../network/MessageGridCraftingPush.java | 62 +++++++++++++++++++ .../refinedstorage/proxy/CommonProxy.java | 1 + 4 files changed, 87 insertions(+), 1 deletion(-) create mode 100755 src/main/java/refinedstorage/network/MessageGridCraftingPush.java diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 6ea9ab657..deac63eaa 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -6,9 +6,14 @@ import refinedstorage.block.EnumGridType; import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.tile.TileGrid; +import java.util.ArrayList; +import java.util.List; + public class ContainerGrid extends ContainerBase { private TileGrid grid; + private List craftingSlots = new ArrayList(); + public ContainerGrid(EntityPlayer player, TileGrid grid) { super(player); @@ -21,7 +26,11 @@ public class ContainerGrid extends ContainerBase { int y = 106; for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(grid.getCraftingInventory(), i, x, y)); + Slot slot = new Slot(grid.getCraftingInventory(), i, x, y); + + craftingSlots.add(slot); + + addSlotToContainer(slot); x += 18; @@ -34,4 +43,8 @@ public class ContainerGrid extends ContainerBase { addSlotToContainer(new SlotGridCraftingResult(player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); } } + + public List getCraftingSlots() { + return craftingSlots; + } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 3efbecce1..bf46877ec 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -14,6 +14,7 @@ import refinedstorage.gui.sidebutton.SideButtonGridSortingDirection; import refinedstorage.gui.sidebutton.SideButtonGridSortingType; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.network.MessageGridCraftingClear; +import refinedstorage.network.MessageGridCraftingPush; import refinedstorage.network.MessageStoragePull; import refinedstorage.network.MessageStoragePush; import refinedstorage.storage.StorageItem; @@ -279,6 +280,15 @@ public class GuiGrid extends GuiBase { } } } + if (grid.getType() == EnumGridType.CRAFTING) { + for (Slot slot : container.getCraftingSlots()) { + if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { + if (GuiScreen.isShiftKeyDown()) { + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingPush(grid, slot.getSlotIndex())); + } + } + } + } } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingPush.java b/src/main/java/refinedstorage/network/MessageGridCraftingPush.java new file mode 100755 index 000000000..6fc60fe59 --- /dev/null +++ b/src/main/java/refinedstorage/network/MessageGridCraftingPush.java @@ -0,0 +1,62 @@ +package refinedstorage.network; + +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.TileGrid; + +public class MessageGridCraftingPush extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int craftingSlot; + + public MessageGridCraftingPush() { + } + + public MessageGridCraftingPush(TileGrid grid, int craftingSlot) { + this.x = grid.getPos().getX(); + this.y = grid.getPos().getY(); + this.z = grid.getPos().getZ(); + this.craftingSlot = craftingSlot; + } + + @Override + public void fromBytes(ByteBuf buf) { + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + craftingSlot = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeInt(craftingSlot); + } + + @Override + public void handle(MessageGridCraftingPush message, EntityPlayerMP player) { + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); + + if (tile instanceof TileGrid) { + TileGrid grid = (TileGrid) tile; + + if (grid.isConnected() && grid.getType() == EnumGridType.CRAFTING && message.craftingSlot < grid.getCraftingInventory().getSizeInventory()) { + ItemStack stack = grid.getCraftingInventory().getStackInSlot(message.craftingSlot); + + if (stack != null) { + if (grid.getController().push(stack)) { + grid.getCraftingInventory().setInventorySlotContents(message.craftingSlot, null); + } + } + } + } + } +} diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index a39b8e253..fa5847c7f 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -38,6 +38,7 @@ public class CommonProxy { RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, 12, Side.SERVER); NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); From b0381fcee32cd8ba8763e6d09a1ad9307653172f Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 00:11:14 +0100 Subject: [PATCH 27/76] Fix importer --- .../refinedstorage/tile/TileImporter.java | 50 ++++++++----------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 9348bf5de..41dcf9d9b 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -20,8 +20,6 @@ public class TileImporter extends TileMachine implements ICompareSetting, IModeS private int compare = 0; private int mode = 0; - private int currentSlot = 0; - @Override public int getEnergyUsage() { return 2; @@ -29,42 +27,36 @@ public class TileImporter extends TileMachine implements ICompareSetting, IModeS @Override public void updateMachine() { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + if (ticks % 5 == 0) { + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) { - IInventory connectedInventory = (IInventory) tile; + if (connectedTile instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedTile; - if (ticks % 5 == 0) { - ItemStack slot = connectedInventory.getStackInSlot(currentSlot); + int[] availableSlots = sided.getSlotsForFace(getDirection().getOpposite()); - while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) { - currentSlot++; + for (int availableSlot : availableSlots) { + ItemStack stack = sided.getStackInSlot(availableSlot); - if (currentSlot > connectedInventory.getSizeInventory() - 1) { - break; - } - } - - if (slot != null && canImport(slot)) { - if (connectedInventory instanceof ISidedInventory) { - ISidedInventory sided = (ISidedInventory) connectedInventory; - - if (sided.canExtractItem(currentSlot, slot.copy(), getDirection().getOpposite())) { - if (getController().push(slot.copy())) { - connectedInventory.setInventorySlotContents(currentSlot, null); - } + if (stack != null && canImport(stack) && sided.canExtractItem(availableSlot, stack, getDirection().getOpposite())) { + if (getController().push(stack.copy())) { + sided.setInventorySlotContents(availableSlot, null); + sided.markDirty(); } - } else if (getController().push(slot.copy())) { - connectedInventory.setInventorySlotContents(currentSlot, null); } - - connectedInventory.markDirty(); } + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; - currentSlot++; + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack stack = inventory.getStackInSlot(i); - if (currentSlot > connectedInventory.getSizeInventory() - 1) { - currentSlot = 0; + if (stack != null && canImport(stack)) { + if (getController().push(stack.copy())) { + inventory.setInventorySlotContents(i, null); + inventory.markDirty(); + } + } } } } From cdf871467001414f566b3a1b35b20bc75551e611 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 00:44:05 +0100 Subject: [PATCH 28/76] Opposite facing for shift click + certain blocks --- src/main/java/refinedstorage/block/BlockBase.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 3100bba22..e754db4e7 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -15,6 +15,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; import refinedstorage.tile.TileBase; import refinedstorage.util.InventoryUtils; @@ -98,10 +99,18 @@ public abstract class BlockBase extends Block { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) { super.onBlockPlacedBy(world, pos, state, player, itemStack); + Block blockPlaced = state.getBlock(); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBase) { - ((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(pos, player)); + EnumFacing facing = BlockPistonBase.getFacingFromEntity(pos, player); + + if (player.isSneaking() && (blockPlaced == RefinedStorageBlocks.IMPORTER || blockPlaced == RefinedStorageBlocks.EXPORTER || blockPlaced == RefinedStorageBlocks.EXTERNAL_STORAGE)) { + facing = facing.getOpposite(); + } + + ((TileBase) tile).setDirection(facing); } } From 31ead233e1f22097fc76b60f5be105434e3577b9 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 00:56:34 +0100 Subject: [PATCH 29/76] Fix controller GUI crashes --- src/main/java/refinedstorage/gui/GuiController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index f85cd9d55..9453f0044 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -10,6 +10,9 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; import refinedstorage.tile.TileMachine; +import java.util.ArrayList; +import java.util.List; + public class GuiController extends GuiBase { private TileController controller; @@ -68,9 +71,11 @@ public class GuiController extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); + List machines = new ArrayList(controller.getMachines()); + for (int i = 0; i < 4; ++i) { - if (slot < controller.getMachines().size()) { - TileMachine machine = controller.getMachines().get(slot); + if (slot < machines.size()) { + TileMachine machine = machines.get(slot); IBlockState machineState = machine.getWorld().getBlockState(machine.getPos()); Block machineBlock = machineState.getBlock(); From b3ae29ed80e5a56386c6f204e16b8da29fec4e99 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 15:45:09 +0100 Subject: [PATCH 30/76] Fix interface bug --- src/main/java/refinedstorage/tile/TileInterface.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index a7a45caca..f5432ff42 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -29,7 +29,7 @@ public class TileInterface extends TileMachine implements ICompareSetting, ISide @Override public void updateMachine() { if (ticks % 5 == 0) { - ItemStack slot = inventory.getStackInSlot(currentSlot); + ItemStack slot; while ((slot = inventory.getStackInSlot(currentSlot)) == null) { currentSlot++; @@ -39,7 +39,7 @@ public class TileInterface extends TileMachine implements ICompareSetting, ISide } } - if (inventory.getStackInSlot(currentSlot) != null) { + if (slot != null) { if (getController().push(slot)) { inventory.setInventorySlotContents(currentSlot, null); } From 85acc2b8859e3b2e1c644280d34f642fb701eaf4 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 16:38:19 +0100 Subject: [PATCH 31/76] Update to latest JEI and Forge --- .gitignore | 3 ++- build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 20171c7a5..dedf846dd 100755 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ run/ *.iml *.ipr *.iws -.idea/ \ No newline at end of file +.idea/ +out/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9e2fcf556..966a9baa9 100755 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9-12.16.0.1770-1.9" + version = "1.9-12.16.0.1811-1.9" runDir = "run" - useDepAts = true + useDepAts = true mappings = "snapshot_20160312" } @@ -30,7 +30,7 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.9:3.0.+" + deobfCompile "mezz.jei:jei_1.9:3.1.+" } processResources { From 655f452a9eb86220bb57f441ecd08181e1e0030d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 18:34:22 +0100 Subject: [PATCH 32/76] Make importer less fast --- .../refinedstorage/tile/TileImporter.java | 74 +++++++++++++------ 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 41dcf9d9b..4c99c4a1c 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -15,11 +15,15 @@ public class TileImporter extends TileMachine implements ICompareSetting, IModeS public static final String NBT_COMPARE = "Compare"; public static final String NBT_MODE = "Mode"; + public static final int SPEED = 3; + private InventorySimple inventory = new InventorySimple("importer", 9, this); private int compare = 0; private int mode = 0; + private int currentSlot; + @Override public int getEnergyUsage() { return 2; @@ -27,38 +31,64 @@ public class TileImporter extends TileMachine implements ICompareSetting, IModeS @Override public void updateMachine() { - if (ticks % 5 == 0) { - TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (connectedTile instanceof ISidedInventory) { - ISidedInventory sided = (ISidedInventory) connectedTile; + if (connectedTile instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedTile; - int[] availableSlots = sided.getSlotsForFace(getDirection().getOpposite()); + int[] availableSlots = sided.getSlotsForFace(getDirection().getOpposite()); - for (int availableSlot : availableSlots) { - ItemStack stack = sided.getStackInSlot(availableSlot); + if (currentSlot >= availableSlots.length) { + currentSlot = 0; + } - if (stack != null && canImport(stack) && sided.canExtractItem(availableSlot, stack, getDirection().getOpposite())) { - if (getController().push(stack.copy())) { - sided.setInventorySlotContents(availableSlot, null); - sided.markDirty(); - } - } - } - } else if (connectedTile instanceof IInventory) { - IInventory inventory = (IInventory) connectedTile; + if (availableSlots.length > 0) { + int availableSlot = availableSlots[currentSlot]; - for (int i = 0; i < inventory.getSizeInventory(); ++i) { - ItemStack stack = inventory.getStackInSlot(i); + ItemStack stack = sided.getStackInSlot(availableSlot); - if (stack != null && canImport(stack)) { - if (getController().push(stack.copy())) { - inventory.setInventorySlotContents(i, null); - inventory.markDirty(); + if (stack == null) { + currentSlot++; + } else { + if (ticks % SPEED == 0) { + ItemStack toTake = stack.copy(); + toTake.stackSize = 1; + + if (canImport(toTake) && sided.canExtractItem(availableSlot, toTake, getDirection().getOpposite())) { + if (getController().push(toTake)) { + sided.decrStackSize(availableSlot, 1); + sided.markDirty(); + } } } } } + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; + + if (currentSlot >= inventory.getSizeInventory()) { + currentSlot = 0; + } + + ItemStack stack = inventory.getStackInSlot(currentSlot); + + if (stack != null) { + if (ticks % SPEED == 0) { + ItemStack toTake = stack.copy(); + toTake.stackSize = 1; + + if (canImport(toTake)) { + if (getController().push(toTake)) { + inventory.decrStackSize(currentSlot, 1); + inventory.markDirty(); + } + } + } + } else { + currentSlot++; + } + } else { + currentSlot = 0; } } From 6421555a2fe22d91ecb396fdd546598b1c1d4a35 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 18:37:43 +0100 Subject: [PATCH 33/76] Better defaults for grid --- src/main/java/refinedstorage/tile/TileGrid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index f2de01a0e..10d83b11a 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -42,8 +42,8 @@ public class TileGrid extends TileMachine { private InventoryCrafting craftingInventory = new InventoryCrafting(craftingContainer, 3, 3); private InventorySimple craftingResultInventory = new InventorySimple("crafting_result", 1); - private int sortingDirection = 0; - private int sortingType = 0; + private int sortingDirection = SORTING_DIRECTION_DESCENDING; + private int sortingType = SORTING_TYPE_NAME; @Override public int getEnergyUsage() { From eb8ca3a796d2ade73d17b9b71bce13c06b47bbde Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 18:43:44 +0100 Subject: [PATCH 34/76] Make exporter less fast too --- .../refinedstorage/tile/TileExporter.java | 13 +++-- .../tile/TileExternalStorage.java | 56 +++++++++---------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 9b6b0d2c1..0d8026fec 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -13,6 +13,8 @@ import refinedstorage.util.InventoryUtils; public class TileExporter extends TileMachine implements ICompareSetting { public static final String NBT_COMPARE = "Compare"; + public static final int SPEED = 3; + private InventorySimple inventory = new InventorySimple("exporter", 9, this); private int compare = 0; @@ -24,19 +26,18 @@ public class TileExporter extends TileMachine implements ICompareSetting { @Override public void updateMachine() { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + TileEntity connectedTile = worldObj.getTileEntity(pos.offset(getDirection())); - if (tile instanceof IInventory) { - IInventory connectedInventory = (IInventory) tile; + if (connectedTile instanceof IInventory) { + IInventory connectedInventory = (IInventory) connectedTile; - if (ticks % 5 == 0) { + if (ticks % SPEED == 0) { for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); if (slot != null) { ItemStack toTake = slot.copy(); - - toTake.stackSize = 64; + toTake.stackSize = 1; ItemStack took = getController().take(toTake, compare); diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 1f6495414..9fa0e4abc 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -48,10 +48,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void addItems(List items) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null) { ItemStack stack = deep.getStoredItemType().copy(); @@ -60,8 +60,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider items.add(new StorageItem(stack.splitStack(Math.min(stack.getMaxStackSize(), stack.stackSize)))); } } - } else if (connectedInventory instanceof IInventory) { - IInventory inventory = (IInventory) connectedInventory; + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; for (int i = 0; i < inventory.getSizeInventory(); ++i) { if (inventory.getStackInSlot(i) != null) { @@ -73,29 +73,29 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public void push(ItemStack stack) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() == null) { deep.setStoredItemType(stack, stack.stackSize); } else { deep.setStoredItemCount(deep.getStoredItemType().stackSize + stack.stackSize); } - } else if (connectedInventory instanceof IInventory) { - InventoryUtils.pushToInventory((IInventory) connectedInventory, stack); + } else if (connectedTile instanceof IInventory) { + InventoryUtils.pushToInventory((IInventory) connectedTile, stack); } } @Override public ItemStack take(ItemStack stack, int flags) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); int quantity = stack.stackSize; - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null && InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { if (deep.getStoredItemType().stackSize < quantity) { @@ -109,8 +109,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider return took; } - } else if (connectedInventory instanceof IInventory) { - IInventory inventory = (IInventory) connectedInventory; + } else if (connectedTile instanceof IInventory) { + IInventory inventory = (IInventory) connectedTile; for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); @@ -141,10 +141,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public boolean canPush(ItemStack stack) { if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack)) { - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null) { if (InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { @@ -155,15 +155,15 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } else { return stack.stackSize < deep.getMaxStoredCount(); } - } else if (connectedInventory instanceof IInventory) { - return InventoryUtils.canPushToInventory((IInventory) connectedInventory, stack); + } else if (connectedTile instanceof IInventory) { + return InventoryUtils.canPushToInventory((IInventory) connectedTile, stack); } } return false; } - public TileEntity getConnectedInventory() { + public TileEntity getConnectedTile() { TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { @@ -179,14 +179,14 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider buf.writeInt(priority); - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedTile = getConnectedTile(); - if (connectedInventory instanceof IDeepStorageUnit) { - IDeepStorageUnit deep = (IDeepStorageUnit) connectedInventory; + if (connectedTile instanceof IDeepStorageUnit) { + IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; buf.writeInt(deep.getStoredItemType() == null ? 0 : deep.getStoredItemType().stackSize); - } else if (connectedInventory instanceof IInventory) { - buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedInventory)); + } else if (connectedTile instanceof IInventory) { + buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedTile)); } else { buf.writeInt(0); } @@ -314,11 +314,11 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider @Override public int getCapacity() { - if (getConnectedInventory() == null) { + if (getConnectedTile() == null) { return 0; } - TileEntity connectedInventory = getConnectedInventory(); + TileEntity connectedInventory = getConnectedTile(); if (connectedInventory instanceof IDeepStorageUnit) { return ((IDeepStorageUnit) connectedInventory).getMaxStoredCount(); From 0024254843902ba35119f243beedd4f1d24a9352 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Mar 2016 21:58:17 +0100 Subject: [PATCH 35/76] If we can't import and/ or extract, move on (otherwise we stay on the same slot forever) --- src/main/java/refinedstorage/tile/TileImporter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 4c99c4a1c..e36febd68 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -59,6 +59,9 @@ public class TileImporter extends TileMachine implements ICompareSetting, IModeS sided.decrStackSize(availableSlot, 1); sided.markDirty(); } + } else { + // If we can't import and/ or extract, move on (otherwise we stay on the same slot forever) + currentSlot++; } } } From b91886171bae0333da4f042a8d5984d87b1e2a88 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 10:00:03 +0200 Subject: [PATCH 36/76] Various code improvements --- .../container/ContainerGrid.java | 4 ---- .../container/slot/IItemValidator.java | 2 +- .../refinedstorage/gui/GuiController.java | 10 ++++------ src/main/java/refinedstorage/gui/GuiGrid.java | 19 +++++++------------ .../java/refinedstorage/gui/GuiStorage.java | 2 +- .../gui/GuiWirelessTransmitter.java | 2 +- .../sidebutton/SideButtonDetectorMode.java | 1 - .../SideButtonGridSortingDirection.java | 1 - .../sidebutton/SideButtonGridSortingType.java | 1 - .../gui/sidebutton/SideButtonMode.java | 1 - .../sidebutton/SideButtonRedstoneMode.java | 1 - .../java/refinedstorage/storage/IStorage.java | 10 +++++----- .../refinedstorage/storage/IStorageGui.java | 18 +++++++++--------- .../storage/IStorageProvider.java | 2 +- .../refinedstorage/tile/INetworkTile.java | 6 +++--- .../refinedstorage/tile/TileController.java | 3 ++- .../tile/settings/ICompareSetting.java | 6 +++--- .../tile/settings/IModeSetting.java | 10 +++++----- .../tile/settings/IRedstoneModeSetting.java | 6 +++--- .../tile/solderer/ISoldererRecipe.java | 6 +++--- 20 files changed, 48 insertions(+), 63 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index deac63eaa..f3d320fe9 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -10,15 +10,11 @@ import java.util.ArrayList; import java.util.List; public class ContainerGrid extends ContainerBase { - private TileGrid grid; - private List craftingSlots = new ArrayList(); public ContainerGrid(EntityPlayer player, TileGrid grid) { super(player); - this.grid = grid; - addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108); if (grid.getType() == EnumGridType.CRAFTING) { diff --git a/src/main/java/refinedstorage/container/slot/IItemValidator.java b/src/main/java/refinedstorage/container/slot/IItemValidator.java index acf5617a7..39f368278 100755 --- a/src/main/java/refinedstorage/container/slot/IItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/IItemValidator.java @@ -3,5 +3,5 @@ package refinedstorage.container.slot; import net.minecraft.item.ItemStack; public interface IItemValidator { - public boolean isValid(ItemStack stack); + boolean isValid(ItemStack stack); } diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 9453f0044..4add29c69 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -14,6 +14,8 @@ import java.util.ArrayList; import java.util.List; public class GuiController extends GuiBase { + public static final int VISIBLE_ROWS = 2; + private TileController controller; private int barX = 8; @@ -36,7 +38,7 @@ public class GuiController extends GuiBase { @Override public void update(int x, int y) { - scrollbar.setCanScroll(getRows() > getVisibleRows()); + scrollbar.setCanScroll(getRows() > VISIBLE_ROWS); } @Override @@ -47,7 +49,7 @@ public class GuiController extends GuiBase { int barHeightNew = (int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * (float) barHeight); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 178, barHeight - barHeightNew, barWidth, barHeightNew); scrollbar.draw(this); } @@ -115,8 +117,4 @@ public class GuiController extends GuiBase { return max < 0 ? 0 : max; } - - private int getVisibleRows() { - return 2; - } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index bf46877ec..0b15f189e 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -22,12 +22,11 @@ import refinedstorage.tile.TileController; import refinedstorage.tile.TileGrid; import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; +import java.util.*; public class GuiGrid extends GuiBase { + public static final int VISIBLE_ROWS = 4; + private ContainerGrid container; private TileGrid grid; @@ -62,17 +61,13 @@ public class GuiGrid extends GuiBase { @Override public void update(int x, int y) { - scrollbar.setCanScroll(getRows() > getVisibleRows()); + scrollbar.setCanScroll(getRows() > VISIBLE_ROWS); } public int getOffset() { return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); } - public int getVisibleRows() { - return 4; - } - public int getRows() { if (!grid.isConnected()) { return 0; @@ -137,7 +132,7 @@ public class GuiGrid extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); - for (int i = 0; i < 9 * getVisibleRows(); ++i) { + for (int i = 0; i < 9 * VISIBLE_ROWS; ++i) { if (slot < items.size()) { int qty = items.get(slot).getQuantity(); @@ -218,7 +213,7 @@ public class GuiGrid extends GuiBase { } } - items.sort(new Comparator() { + Collections.sort(items, new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { if (o1 != null && o2 != null) { @@ -234,7 +229,7 @@ public class GuiGrid extends GuiBase { }); if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { - items.sort(new Comparator() { + Collections.sort(items, new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { if (o1 != null && o2 != null) { diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index f6f1bd1de..e1f1b106b 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -69,7 +69,7 @@ public class GuiStorage extends GuiBase { int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, barHeight - barHeightNew, barWidth, barHeightNew); priorityField.drawTextBox(); } diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java index c99927739..a903f1f6b 100755 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -31,7 +31,7 @@ public class GuiWirelessTransmitter extends GuiBase { if (wirelessTransmitter.isWorking()) { int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); - drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, 0 + progress, 14, 14); + drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, progress, 14, 14); } } diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java index 351c23594..43bd88417 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -20,7 +20,6 @@ public class SideButtonDetectorMode extends SideButton { StringBuilder builder = new StringBuilder(); builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); return builder.toString(); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java index 92f6a0cbe..b7ccb59c5 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -18,7 +18,6 @@ public class SideButtonGridSortingDirection extends SideButton { StringBuilder builder = new StringBuilder(); builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.direction")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); return builder.toString(); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index 38ffc43d3..e5f04f2ce 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -18,7 +18,6 @@ public class SideButtonGridSortingType extends SideButton { StringBuilder builder = new StringBuilder(); builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:sorting.type")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); return builder.toString(); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java index 6191b47e1..f8b8bc4e4 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -18,7 +18,6 @@ public class SideButtonMode extends SideButton { StringBuilder builder = new StringBuilder(); builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); return builder.toString(); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java index fcbfe747e..c8878d2be 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -18,7 +18,6 @@ public class SideButtonRedstoneMode extends SideButton { StringBuilder builder = new StringBuilder(); builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n"); - builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); return builder.toString(); diff --git a/src/main/java/refinedstorage/storage/IStorage.java b/src/main/java/refinedstorage/storage/IStorage.java index ef06413d4..fbffed542 100755 --- a/src/main/java/refinedstorage/storage/IStorage.java +++ b/src/main/java/refinedstorage/storage/IStorage.java @@ -5,13 +5,13 @@ import net.minecraft.item.ItemStack; import java.util.List; public interface IStorage { - public void addItems(List items); + void addItems(List items); - public void push(ItemStack stack); + void push(ItemStack stack); - public ItemStack take(ItemStack stack, int flags); + ItemStack take(ItemStack stack, int flags); - public boolean canPush(ItemStack stack); + boolean canPush(ItemStack stack); - public int getPriority(); + int getPriority(); } diff --git a/src/main/java/refinedstorage/storage/IStorageGui.java b/src/main/java/refinedstorage/storage/IStorageGui.java index adac2c220..3361d1fee 100755 --- a/src/main/java/refinedstorage/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -6,21 +6,21 @@ import refinedstorage.tile.settings.IModeSetting; import refinedstorage.tile.settings.IRedstoneModeSetting; public interface IStorageGui { - public String getName(); + String getName(); - public int getPriority(); + int getPriority(); - public void onPriorityChanged(int priority); + void onPriorityChanged(int priority); - public IInventory getInventory(); + IInventory getInventory(); - public IRedstoneModeSetting getRedstoneModeSetting(); + IRedstoneModeSetting getRedstoneModeSetting(); - public ICompareSetting getCompareSetting(); + ICompareSetting getCompareSetting(); - public IModeSetting getModeSetting(); + IModeSetting getModeSetting(); - public int getStored(); + int getStored(); - public int getCapacity(); + int getCapacity(); } diff --git a/src/main/java/refinedstorage/storage/IStorageProvider.java b/src/main/java/refinedstorage/storage/IStorageProvider.java index 8debb2a15..7c9d8e699 100755 --- a/src/main/java/refinedstorage/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/storage/IStorageProvider.java @@ -3,5 +3,5 @@ package refinedstorage.storage; import java.util.List; public interface IStorageProvider { - public void addStorages(List storages); + void addStorages(List storages); } diff --git a/src/main/java/refinedstorage/tile/INetworkTile.java b/src/main/java/refinedstorage/tile/INetworkTile.java index 4363703d2..0e19c28de 100755 --- a/src/main/java/refinedstorage/tile/INetworkTile.java +++ b/src/main/java/refinedstorage/tile/INetworkTile.java @@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf; import net.minecraft.util.math.BlockPos; public interface INetworkTile { - public void fromBytes(ByteBuf buf); + void fromBytes(ByteBuf buf); - public void toBytes(ByteBuf buf); + void toBytes(ByteBuf buf); - public BlockPos getTilePos(); + BlockPos getTilePos(); } diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 10934912b..2c1e5d23d 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -19,6 +19,7 @@ import refinedstorage.tile.settings.RedstoneMode; import refinedstorage.util.InventoryUtils; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -82,7 +83,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor } } - storages.sort(new Comparator() { + Collections.sort(storages, new Comparator() { @Override public int compare(IStorage s1, IStorage s2) { return (s1.getPriority() > s2.getPriority()) ? -1 : 1; diff --git a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java index 7c9177eec..37fb20595 100755 --- a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java +++ b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java @@ -3,9 +3,9 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; public interface ICompareSetting { - public int getCompare(); + int getCompare(); - public void setCompare(int compare); + void setCompare(int compare); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IModeSetting.java b/src/main/java/refinedstorage/tile/settings/IModeSetting.java index f708d567c..387e389da 100755 --- a/src/main/java/refinedstorage/tile/settings/IModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IModeSetting.java @@ -3,13 +3,13 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; public interface IModeSetting { - public boolean isWhitelist(); + boolean isWhitelist(); - public boolean isBlacklist(); + boolean isBlacklist(); - public void setToWhitelist(); + void setToWhitelist(); - public void setToBlacklist(); + void setToBlacklist(); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java index d7eec1375..379857da5 100755 --- a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java @@ -3,9 +3,9 @@ package refinedstorage.tile.settings; import net.minecraft.util.math.BlockPos; public interface IRedstoneModeSetting { - public RedstoneMode getRedstoneMode(); + RedstoneMode getRedstoneMode(); - public void setRedstoneMode(RedstoneMode mode); + void setRedstoneMode(RedstoneMode mode); - public BlockPos getMachinePos(); + BlockPos getMachinePos(); } diff --git a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java index 9a1007efd..badf33df5 100755 --- a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java +++ b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java @@ -3,9 +3,9 @@ package refinedstorage.tile.solderer; import net.minecraft.item.ItemStack; public interface ISoldererRecipe { - public ItemStack getRow(int row); + ItemStack getRow(int row); - public ItemStack getResult(); + ItemStack getResult(); - public int getDuration(); + int getDuration(); } From 32b4085d703cd0c68be93e5dfb3d0111f87500c4 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 10:12:55 +0200 Subject: [PATCH 37/76] Shift clicking for disk drive --- .../container/ContainerDiskDrive.java | 33 ++++++++++++++++++- .../container/ContainerStorage.java | 10 +++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/refinedstorage/container/ContainerDiskDrive.java index e2d0a753c..0eb2c636f 100755 --- a/src/main/java/refinedstorage/container/ContainerDiskDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDiskDrive.java @@ -1,6 +1,8 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import refinedstorage.RefinedStorageItems; import refinedstorage.container.slot.BasicItemValidator; import refinedstorage.container.slot.SlotFiltered; @@ -8,7 +10,7 @@ import refinedstorage.tile.TileDiskDrive; public class ContainerDiskDrive extends ContainerStorage { public ContainerDiskDrive(EntityPlayer player, TileDiskDrive drive) { - super(player, drive.getInventory()); + super(player); for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotFiltered(drive, i, 98 + (i * 18), 78, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); @@ -17,5 +19,34 @@ public class ContainerDiskDrive extends ContainerStorage { for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotFiltered(drive, 4 + i, 98 + (i * 18), 96, new BasicItemValidator(RefinedStorageItems.STORAGE_DISK))); } + + addSpecimenAndPlayerInventorySlots(drive.getInventory()); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack stack = null; + + Slot slot = getSlot(index); + + if (slot != null && slot.getHasStack()) { + stack = slot.getStack().copy(); + + if (index < 8) { + if (!mergeItemStack(stack, 8, inventorySlots.size(), true)) { + return null; + } + } else if (!mergeItemStack(stack, 0, 8, false)) { + 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/refinedstorage/container/ContainerStorage.java index dcc1535a7..f8133a7fc 100755 --- a/src/main/java/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/refinedstorage/container/ContainerStorage.java @@ -5,9 +5,17 @@ import net.minecraft.inventory.IInventory; import refinedstorage.container.slot.SlotSpecimen; public class ContainerStorage extends ContainerBase { - public ContainerStorage(EntityPlayer player, IInventory inventory) { + public ContainerStorage(EntityPlayer player) { super(player); + } + public ContainerStorage(EntityPlayer player, IInventory inventory) { + this(player); + + addSpecimenAndPlayerInventorySlots(inventory); + } + + protected void addSpecimenAndPlayerInventorySlots(IInventory inventory) { for (int i = 0; i < 9; ++i) { addSlotToContainer(new SlotSpecimen(inventory, i, 8 + (18 * i), 20, false)); } From ca12a9c464eb68def36be78a2f5e9c2fd884ef28 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 10:19:20 +0200 Subject: [PATCH 38/76] Make interface slower as well --- .../refinedstorage/tile/TileInterface.java | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index f5432ff42..3665975b8 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -15,6 +15,15 @@ import refinedstorage.util.InventoryUtils; public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory { public static final String NBT_COMPARE = "Compare"; + public static final int SPEED = 3; + + public static final int[] FACES = new int[]{ + 0, 1, 2, 3, 4, 5, 6, 7, 8 + }; + public static final int[] FACES_DOWN = new int[]{ + 18, 19, 20, 21, 22, 23, 24, 25, 26 + }; + private InventorySimple inventory = new InventorySimple("interface", 9 * 3); private int compare = 0; @@ -28,27 +37,22 @@ public class TileInterface extends TileMachine implements ICompareSetting, ISide @Override public void updateMachine() { - if (ticks % 5 == 0) { - ItemStack slot; + if (currentSlot > 8) { + currentSlot = 0; + } - while ((slot = inventory.getStackInSlot(currentSlot)) == null) { - currentSlot++; - - if (currentSlot > 8) { - break; - } - } - - if (slot != null) { - if (getController().push(slot)) { - inventory.setInventorySlotContents(currentSlot, null); - } - } + ItemStack slot = getStackInSlot(currentSlot); + if (slot == null) { currentSlot++; + } else { + if (ticks % SPEED == 0) { + ItemStack toPush = slot.copy(); + toPush.stackSize = 1; - if (currentSlot > 8) { - currentSlot = 0; + if (getController().push(toPush)) { + decrStackSize(currentSlot, 1); + } } } @@ -229,17 +233,7 @@ public class TileInterface extends TileMachine implements ICompareSetting, ISide @Override public int[] getSlotsForFace(EnumFacing side) { - if (side == EnumFacing.DOWN) { - return new int[] - { - 18, 19, 20, 21, 22, 23, 24, 25, 26 - }; - } - - return new int[] - { - 0, 1, 2, 3, 4, 5, 6, 7, 8 - }; + return side == EnumFacing.DOWN ? FACES_DOWN : FACES; } @Override From c10f2054f5f0bede8702000f50dd6be8d0af847e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 10:23:17 +0200 Subject: [PATCH 39/76] Use constant faces for solderer --- .../refinedstorage/tile/TileSolderer.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 8c67e439f..b7f3e593c 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -19,6 +19,13 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven public static final String NBT_WORKING = "Working"; public static final String NBT_PROGRESS = "Progress"; + public static final int[] FACES = new int[]{ + 0, 1, 2 + }; + public static final int[] FACES_DOWN = new int[]{ + 3 + }; + private InventorySimple inventory = new InventorySimple("solderer", 4); private ISoldererRecipe recipe; @@ -232,17 +239,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven @Override public int[] getSlotsForFace(EnumFacing side) { - if (side != EnumFacing.DOWN) { - return new int[] - { - 0, 1, 2 - }; - } - - return new int[] - { - 3 - }; + return side == EnumFacing.DOWN ? FACES_DOWN : FACES; } @Override From 9cd7010c0a3d4021abf7020fe83e75dfbe8a9791 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 13:37:34 +0200 Subject: [PATCH 40/76] Allow whitelist / blacklist and filters on destructors --- .../container/ContainerConstructor.java | 17 +-- .../container/ContainerDestructor.java | 10 +- .../container/slot/SlotSpecimenItemBlock.java | 16 +++ .../refinedstorage/gui/GuiDestructor.java | 12 +- .../java/refinedstorage/gui/GuiHandler.java | 2 +- .../refinedstorage/tile/TileConstructor.java | 4 +- .../refinedstorage/tile/TileDestructor.java | 114 ++++++++++++++++-- .../textures/gui/destructor.png | Bin 1788 -> 1807 bytes 8 files changed, 147 insertions(+), 28 deletions(-) create mode 100755 src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java diff --git a/src/main/java/refinedstorage/container/ContainerConstructor.java b/src/main/java/refinedstorage/container/ContainerConstructor.java index 910dfcebb..bd94f4f61 100755 --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -1,28 +1,15 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import refinedstorage.container.slot.SlotSpecimen; +import refinedstorage.container.slot.SlotSpecimenItemBlock; import refinedstorage.tile.TileConstructor; public class ContainerConstructor extends ContainerBase { - class SlotConstructor extends SlotSpecimen { - public SlotConstructor(IInventory inventory, int id, int x, int y) { - super(inventory, id, x, y, false); - } - - @Override - public boolean isItemValid(ItemStack stack) { - return stack.getItem() instanceof ItemBlock; - } - } public ContainerConstructor(EntityPlayer player, TileConstructor constructor) { super(player); - addSlotToContainer(new SlotConstructor(constructor.getInventory(), 0, 80, 20)); + addSlotToContainer(new SlotSpecimenItemBlock(constructor.getInventory(), 0, 80, 20)); addPlayerInventory(8, 55); } diff --git a/src/main/java/refinedstorage/container/ContainerDestructor.java b/src/main/java/refinedstorage/container/ContainerDestructor.java index ce722492e..e97a4af5c 100755 --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -1,11 +1,17 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; +import refinedstorage.container.slot.SlotSpecimenItemBlock; +import refinedstorage.tile.TileDestructor; public class ContainerDestructor extends ContainerBase { - public ContainerDestructor(EntityPlayer player) { + public ContainerDestructor(EntityPlayer player, TileDestructor destructor) { super(player); - addPlayerInventory(8, 50); + for (int i = 0; i < 9; ++i) { + addSlotToContainer(new SlotSpecimenItemBlock(destructor.getInventory(), i, 8 + (18 * i), 20)); + } + + addPlayerInventory(8, 55); } } diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java b/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java new file mode 100755 index 000000000..104875755 --- /dev/null +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimenItemBlock.java @@ -0,0 +1,16 @@ +package refinedstorage.container.slot; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class SlotSpecimenItemBlock extends SlotSpecimen { + public SlotSpecimenItemBlock(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y, false); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return stack.getItem() instanceof ItemBlock; + } +} diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java index 247a1ed0b..1e19a2fd8 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -1,14 +1,17 @@ package refinedstorage.gui; import refinedstorage.container.ContainerDestructor; +import refinedstorage.gui.sidebutton.SideButtonCompare; +import refinedstorage.gui.sidebutton.SideButtonMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; +import refinedstorage.util.InventoryUtils; public class GuiDestructor extends GuiBase { private TileDestructor destructor; public GuiDestructor(ContainerDestructor container, TileDestructor destructor) { - super(container, 176, 131); + super(container, 176, 137); this.destructor = destructor; } @@ -16,6 +19,11 @@ public class GuiDestructor extends GuiBase { @Override public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(destructor)); + + addSideButton(new SideButtonMode(destructor)); + + addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_NBT)); } @Override @@ -32,6 +40,6 @@ public class GuiDestructor extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:destructor")); - drawString(7, 39, t("container.inventory")); + drawString(7, 43, t("container.inventory")); } } diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index 9ff5d33df..c0bea9630 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -31,7 +31,7 @@ public class GuiHandler implements IGuiHandler { case RefinedStorageGui.WIRELESS_TRANSMITTER: return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); case RefinedStorageGui.DESTRUCTOR: - return new ContainerDestructor(player); + return new ContainerDestructor(player, (TileDestructor) tile); case RefinedStorageGui.CONSTRUCTOR: return new ContainerConstructor(player, (TileConstructor) tile); case RefinedStorageGui.STORAGE: diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index eb69f69ed..f138c2cf0 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -11,6 +11,8 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; public class TileConstructor extends TileMachine implements ICompareSetting { + public static final int SPEED = 10; + public static final String NBT_COMPARE = "Compare"; private InventorySimple inventory = new InventorySimple("constructor", 1, this); @@ -24,7 +26,7 @@ public class TileConstructor extends TileMachine implements ICompareSetting { @Override public void updateMachine() { - if (ticks % 10 == 0) { + if (ticks % SPEED == 0) { BlockPos front = pos.offset(getDirection()); if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null) { diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 968968485..d8ed2200b 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -1,14 +1,31 @@ package refinedstorage.tile; +import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.IModeSetting; +import refinedstorage.tile.settings.ModeSettingUtils; import refinedstorage.util.InventoryUtils; import java.util.List; -public class TileDestructor extends TileMachine { +public class TileDestructor extends TileMachine implements ICompareSetting, IModeSetting { + public static final String NBT_COMPARE = "Compare"; + public static final String NBT_MODE = "Mode"; + + public static final int SPEED = 10; + + private InventorySimple inventory = new InventorySimple("destructor", 9, this); + + private int compare = 0; + private int mode = 0; + @Override public int getEnergyUsage() { return 1; @@ -16,23 +33,106 @@ public class TileDestructor extends TileMachine { @Override public void updateMachine() { - if (ticks % 10 == 0) { + if (ticks % SPEED == 0) { BlockPos front = pos.offset(getDirection()); IBlockState frontBlockState = worldObj.getBlockState(front); Block frontBlock = frontBlockState.getBlock(); if (!frontBlock.isAir(frontBlockState, worldObj, front)) { - List drops = frontBlock.getDrops(worldObj, front, worldObj.getBlockState(front), 0); + if (ModeSettingUtils.doesNotViolateMode(inventory, this, compare, new ItemStack(frontBlock, 1, frontBlock.getMetaFromState(frontBlockState)))) { + List drops = frontBlock.getDrops(worldObj, front, frontBlockState, 0); - worldObj.setBlockToAir(front); + worldObj.setBlockToAir(front); - for (ItemStack drop : drops) { - if (!getController().push(drop)) { - InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); + for (ItemStack drop : drops) { + if (!getController().push(drop)) { + InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); + } } } } } } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public boolean isWhitelist() { + return mode == 0; + } + + @Override + public boolean isBlacklist() { + return mode == 1; + } + + @Override + public void setToWhitelist() { + markDirty(); + + this.mode = 0; + } + + @Override + public void setToBlacklist() { + markDirty(); + + this.mode = 1; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + if (nbt.hasKey(NBT_MODE)) { + mode = nbt.getInteger(NBT_MODE); + } + + InventoryUtils.restoreInventory(inventory, 0, nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + + InventoryUtils.saveInventory(inventory, 0, nbt); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + buf.writeInt(mode); + } + + public IInventory getInventory() { + return inventory; + } } diff --git a/src/main/resources/assets/refinedstorage/textures/gui/destructor.png b/src/main/resources/assets/refinedstorage/textures/gui/destructor.png index c0c97a66ec2dc4b9a32b246d39f270a9ea63f774..6de1a9c413ed6a57b51a85e3a57da6600ee8b831 100755 GIT binary patch delta 475 zcmeyv+t0V5i>2N&$GFaqfq^N*)5S5QBJS<2i&?iFBw7Nm_TB$K@vha(DAn*|Z~Ql( z`KiJ4rZs@S>A<7Mb@tz0?%Vgc?#{PNhX*%a{;&TXq5pyN!$$Avr;8fd9p>$GWME)8 zQLWDnq!>PZ;bmfAaJW|;3FQ1>`SEpc_P00o^L?0O_Lu(7RIdlA0fL4--#0;6KyqEY z{lOp0=a(7rY;Xs1u^PoNVR`-q1&6whBC{XK)8E|mR=>=!v#Q#xV)yrZoKTY#-tX0c z8QQRO{QzXjbYLx^o>?mk-wbR0h?a)hU4KIyyNxvZfbOYCpx*1t#EPzo3G@wvi<+rZe>)PuAP*?12V?b L)z4*}Q$iB}xQo4) delta 460 zcmeC@`@_4Ti>2P|PfzlF1_q{3PZ!6KinzD8FJ|3#kZ1|K+IRo|#Jjs@Mk$6Ld*i?P z%uf!UH?22hSQs7qe*e9({P(ZE--WlAGd3nKzyJT+#<&Oi2afB->YZklW2pSa#>l{+ z@I6k90SKPFlxAUIXt+}y3F1vyo-Y8Tir%LJl`uHW+gI-hq)+Uf&I+V(>ty=yy88N? zoAq`x*>=>u{&v|9q#6Wve%}OP0LgXp|1bEzbbgr;&xH4S>CN}cHl^#&^Ez6YKU*u!ez3pYD-6}@@NTaTl*!PrbN$ZMer=53 zI2ao88cuT@_*n7IY^^B!kI$3S-(N6f{7}JN_VV*3ZRv_9agz_QnN2>=rjCTArNa0M b_Wx%)KlSN}8(XAIK*oBy`njxgN@xNAIeEBl From d033b5af64b186f6b3ac76036b89bc91dd2fd1c7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 15:13:52 +0200 Subject: [PATCH 41/76] Better check for placing blocks in constructor --- src/main/java/refinedstorage/tile/TileConstructor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index f138c2cf0..361c7aef2 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -1,6 +1,7 @@ package refinedstorage.tile; import io.netty.buffer.ByteBuf; +import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -26,14 +27,16 @@ public class TileConstructor extends TileMachine implements ICompareSetting { @Override public void updateMachine() { - if (ticks % SPEED == 0) { + if (ticks % SPEED == 0 && inventory.getStackInSlot(0) != null) { BlockPos front = pos.offset(getDirection()); - if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null) { + Block tryingToPlace = ((ItemBlock) inventory.getStackInSlot(0).getItem()).getBlock(); + + if (tryingToPlace.canPlaceBlockAt(worldObj, front)) { ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare); if (took != null) { - worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); + worldObj.setBlockState(front, tryingToPlace.getStateFromMeta(took.getItemDamage()), 1 | 2); } } } From 97d635a8ccf3f8e71eddb9253229eef85da0ed81 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 15:58:36 +0200 Subject: [PATCH 42/76] Pass TE instance to inventories --- src/main/java/refinedstorage/tile/TileInterface.java | 2 +- src/main/java/refinedstorage/tile/TileSolderer.java | 2 +- src/main/java/refinedstorage/tile/TileWirelessTransmitter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 3665975b8..ae6076258 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -24,7 +24,7 @@ public class TileInterface extends TileMachine implements ICompareSetting, ISide 18, 19, 20, 21, 22, 23, 24, 25, 26 }; - private InventorySimple inventory = new InventorySimple("interface", 9 * 3); + private InventorySimple inventory = new InventorySimple("interface", 9 * 3, this); private int compare = 0; diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index b7f3e593c..b1a35c75a 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -26,7 +26,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven 3 }; - private InventorySimple inventory = new InventorySimple("solderer", 4); + private InventorySimple inventory = new InventorySimple("solderer", 4, this); private ISoldererRecipe recipe; diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 82c1a68a5..3c8743f1a 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -17,7 +17,7 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory { public static final String NBT_WORKING = "Working"; public static final String NBT_PROGRESS = "Progress"; - private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3); + private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3, this); private boolean working = false; private int progress = 0; From 2711a3d50cae2c4a4fe5974c98aadbd3f0976b98 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 16:27:26 +0200 Subject: [PATCH 43/76] Show machine coords in controller --- .../java/refinedstorage/gui/GuiController.java | 15 +++++++++++++++ .../assets/refinedstorage/lang/en_US.lang | 3 +++ .../assets/refinedstorage/lang/nl_NL.lang | 3 +++ 3 files changed, 21 insertions(+) diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index 4add29c69..f52eafa4d 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -5,6 +5,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileController; @@ -75,6 +76,8 @@ public class GuiController extends GuiBase { List machines = new ArrayList(controller.getMachines()); + TileMachine machineHovering = null; + for (int i = 0; i < 4; ++i) { if (slot < machines.size()) { TileMachine machine = machines.get(slot); @@ -91,6 +94,10 @@ public class GuiController extends GuiBase { drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 3, scale), machineStack.getDisplayName()); drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); GlStateManager.popMatrix(); + + if (inBounds(x, y, 16, 16, mouseX, mouseY)) { + machineHovering = machine; + } } if (i == 1) { @@ -103,6 +110,14 @@ public class GuiController extends GuiBase { slot++; } + if (machineHovering != null) { + String message = I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.x", machineHovering.getPos().getX()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.y", machineHovering.getPos().getY()); + message += "\n" + I18n.translateToLocalFormatted("gui.refinedstorage:controller.machine_position.z", machineHovering.getPos().getZ()); + + drawTooltip(mouseX, mouseY, message); + } + if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 4ca573f22..4bbc86804 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Grid gui.refinedstorage:disk_drive=Drive gui.refinedstorage:external_storage=External Storage diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 261a9985b..28db69375 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -2,6 +2,9 @@ itemGroup.refinedstorage=Refined Storage gui.refinedstorage:controller.0=Controller gui.refinedstorage:controller.1=Creative Controller +gui.refinedstorage:controller.machine_position.x=X: %d +gui.refinedstorage:controller.machine_position.y=Y: %d +gui.refinedstorage:controller.machine_position.z=Z: %d gui.refinedstorage:grid=Rooster gui.refinedstorage:disk_drive=Schijf gui.refinedstorage:external_storage=Externe Opslag From d7de2a6eeb5070050c41f95f9474d36e8db6c72b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 16:41:10 +0200 Subject: [PATCH 44/76] Make normal grid one row larger --- .../container/ContainerGrid.java | 2 +- src/main/java/refinedstorage/gui/GuiGrid.java | 21 ++++++++++++------ .../refinedstorage/textures/gui/grid.png | Bin 1940 -> 1960 bytes 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index f3d320fe9..fff95f757 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -15,7 +15,7 @@ public class ContainerGrid extends ContainerBase { public ContainerGrid(EntityPlayer player, TileGrid grid) { super(player); - addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 108); + addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 126); if (grid.getType() == EnumGridType.CRAFTING) { int x = 25; diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 0b15f189e..a42316d84 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -25,8 +25,6 @@ import java.io.IOException; import java.util.*; public class GuiGrid extends GuiBase { - public static final int VISIBLE_ROWS = 4; - private ContainerGrid container; private TileGrid grid; @@ -35,13 +33,14 @@ public class GuiGrid extends GuiBase { private int hoveringSlotId; private int hoveringId; - private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); + private Scrollbar scrollbar; public GuiGrid(ContainerGrid container, TileGrid grid) { - super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); + super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 208); this.container = container; this.grid = grid; + this.scrollbar = new Scrollbar(174, 20, 12, grid.getType() == EnumGridType.CRAFTING ? 70 : 88); } @Override @@ -61,7 +60,7 @@ public class GuiGrid extends GuiBase { @Override public void update(int x, int y) { - scrollbar.setCanScroll(getRows() > VISIBLE_ROWS); + scrollbar.setCanScroll(getRows() > getVisibleRows()); } public int getOffset() { @@ -119,7 +118,7 @@ public class GuiGrid extends GuiBase { drawString(7, 94, t("container.crafting")); } - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, t("container.inventory")); + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); int x = 8; int y = 20; @@ -132,7 +131,7 @@ public class GuiGrid extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); - for (int i = 0; i < 9 * VISIBLE_ROWS; ++i) { + for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (slot < items.size()) { int qty = items.get(slot).getQuantity(); @@ -299,4 +298,12 @@ public class GuiGrid extends GuiBase { super.keyTyped(character, keyCode); } } + + public int getVisibleRows() { + if (grid.getType() == EnumGridType.CRAFTING) { + return 4; + } + + return 5; + } } diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png index 2d6a3bb865e42ca4abf2691f42ff7352ca71912c..d2bc104a9cca0509aaf93c2e198c779526fbf2c2 100644 GIT binary patch literal 1960 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)trjPAcDtOW{6l(rIsj|=o#o)<`~!c z0Sgp9PZ!6KinzCTFXjmw3bb8R&Ak7ABC~hhHQ&QWPknUIneXqRe75zbZP$totIBrY z-PXB#@13&ScIxj+8*^WM|No~V@`3q*<6C0&)^ojKu*^AjkN-i?Rnz)|$@v@wy06~* zb22bA?D5D4rOXM3+gKFNTknZvSoi(^Qqd{2{Np&I1lxzl)z{BltG{Ps`*fcq z$AtRqKD+z5pTA7`%?8v~Iq@DyHyF6trriaJO=UP=Uip5TCff;J@6{jj)Hj!A1@le_ z?&q>UQ!5QpS#g62tbu{ylhR&Lv3j7cEGy%oazt_5m11bEl0a%EG!4uaiP%+=|_r_-Jkg{l81Y@7G&3{8@H#@gBGO%ZyKUwu7}>);0mP zPIxXS*1+)Ow?S0v{nrz3T5Vm)cEa{@;KQe35Z6JKfNcX32Ufg)yyCV9^OJi^Lo2pV zhNxG6yW+#)JKI441OhM%K+LP8+t~gX ze9V8#ey`r=r^sFTsuWiDbD|ArQkf_0%waH^&g<}O6XS^(GlrR`*%XRzGNkB9lP3ub c`nz>Z2Nu0ZJGyek6OflYUHx3vIVCg!0DW6!jQ{`u literal 1940 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)hnjIW$F9smkTl(rIsj|=o#o)<`~!c zF)%Rw@^o8NOeQIE<^|1_6Ysh@=3;7KrO}7X|CmS&2(o*HC~6}25;+z-_v#K*NQvH z{qkOK_rHYUXFcn-PZG~(^C^6{)d4y3#8q_;Ahq*-A|r=`UHiuHACdhK56v;o6_v}I zdmHK%hNAn2f#C@O5??L*cKI4QoQwU&b-v8#J74Z9#!t&~MfaU~4i0Ugs)jq?H^7uL zyz(n@%k5$;dbcUOV%y}MrQiCNE!vgaI9qTXsySGW_b?Nd Date: Sun, 27 Mar 2016 17:13:56 +0200 Subject: [PATCH 45/76] Add changelog file --- CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100755 index 000000000..5049cf141 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,48 @@ +# Refined Storage Changelog + +### 0.5 +**Bugfixes** +- Fix clicking sound in Grid +- Fix NPE in Grid while sorting +- Fix exporter not exporting is some cases +- Fix importer not importing in some cases +- Fix controller drawing RF every 20 ticks instead of every tick +- Fix not being able to shift click from Crafting Grid crafting slots +- Fix crash with interfaces +- Check if the Contructor can actually place said block in the world + +**Features** +- New textures +- Updated to the latest Forge and JEI +- Renamed Drives to Disk Drives +- Renamed Storage Cells to Storage Disks +- Drives have a better interface and there are now blacklist and whitelist filters for the Storage Disks in it too. +- Destructors have the ability to whitelist and blacklist certain items now +- Shift clicking stuff in the Interface +- Scrollbar in Grid and Crafting Grid +- Made the normal Grid 1 row larger +- Display of connected machines in the Controller GUI +- Deep Storage Unit integration (with this several barrel mods are now supported too!) +- Machines don't need to be connected with cables anymore, they can be next to each other too +- Made the amount text in the Grid for items smaller +- Nice formatting for items >= 1K +- When placing Importer, Exporter or External Storage with SHIFT, it will have the opposite direction. This is for easy placement behind other blocks (furnaces for example) + +### 0.4.1 +**Bugfixes** +- Fix ID duplication issues + +### 0.4 +**Bugfixes** +- Cables now have actual collision +- Fullness percentage in Creative Storage Blocks going under 0% +- The Controller shouldn't display the base usage when not working +- Fix Minecraft reporting that retrieving Grid type fails +- Check isItemValidForSlot on trying to push to inventories + +**Features** +- Relays +- Interfaces + +### 0.3 +- Initial release \ No newline at end of file From d5aef724bd333e66ba9a12820ced7a7bbe5532d3 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 17:17:57 +0200 Subject: [PATCH 46/76] Update logo --- logo.png | Bin 3938 -> 5399 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/logo.png b/logo.png index a023d0cd29ce698e12fb3dfa1786de3c070e2061..0b3372b629bbca7c0c7fbec7bdfaeba81591c998 100755 GIT binary patch literal 5399 zcmeHLeM}Q)96shmr@@+SWJYw5B})f?z_K}z&swCEYHbU&LpGq22!4Q+*j84A!mMT= z2B`v8bhUhRp%g8;jhGSJG@RmzO>XoszL?cQs9``=_s26)Nke)qdy z-}IjM_dL)0-WMDeJ!s9wH4p>^G15{pASghNpQ~4Z%(eU<-QW@+%%CSjy1`Ae;O6Ch z)Lm2vx>~yy&0h&YDuTJf`UM*5Wg49|{xOyjw5BVCG4HZp1V0@Iy5X#;;I>vR{D>kXW| zy@%H08So%DJ0!&$H1L;fsYFgHAeaQrM4b6TRv*l0@<9s8_p(4mt7Y1i4=Q_!`tQmO7bB^Par@3iL+m z1xz|}+}9HWuley{zvENwgk~R9i=kjXEc9YMpZDQUBMS-5s_vo9BO&&%&D>E5L`&bP2WqL^42(FMYNcPwNecgh>wiC( zD>QJ{lh>wFp?1qYG9}je14F235N)@jP-sW{@z&nukwTFOP#tGnh zdr6;ermp08U3-Za0}pzr&b2?N3ss``KO$*`*q`d#vq#C(6yQx&NxPTq2I@JskP^8Q m{^j4;=6gR3WI54!&r8{>i#HwJzVR>o3lW3HO3@|nIrcY~1TQxL literal 3938 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL9LzwG?TN?!0V&4fAa^H*b?0PW0y!+{j=qiz z3>*8o|0J?9FfcO&_=LCu#f^KlpD>gJ`33(U z*?=MVJG&|{<~a*IB8wRq_zr_GR|DNig)Whh9@%q!8$OD$0_ z(KFDq%rUO>V_@Lg?djqeQW5v|qTxD)oq{ZZYnS|vue`>o|DjiA!etqSdC?hVq0j2; z{>J{ZetdYpYpcyNC%It7{*@Dshnz^(dSWR0X$DuN4@tsj7Pks4`&)mk{n&a+je=PG zIakpoxusHcztObcZmklhYZp89Jlz+lc&zCD3W4OE`5_$}@0e>HiFhY1nxyl+m&=ga z%8tovwmA1@u>C*tqu@Z%G0X7Kj*W8)&xHc5OP^C53Urd>^O#Vedj^lxT%DG!z0T|{ zng3^hT=;P{<8ukdIRT2y=M0%F7CN!bNoFZLDi@ihCIRR!kTmjUS|2H?(a0){xO-u>Mi_u_9(B10`utJU1}(oL~cnySV~` z@+L=M$n$a>=*S5GhW$`f@+XGFpYKMV1Cv`?_($#Jos5h;95;a}InRNC*=ZXvAxjG! zXqd1TnB3V|3=~pU15^7@R8qHCV4A_RV>J#YZZnweOzKP@$Ry{T=>>WWm=e$Q?iAb< z3QBJ~4b6d`1|~;C^Ji`+!a%9@*|9so00E}SV|QjqD@KEo>z@ZO5L}b%fTj2|^$&}HQQl!_-zW}B z1U)}F_hbNLGU<%}16N?&3MAJt=}Q4)TjH~D#YIq1&6t0n8qtPPrM1RC>i;@HF%yu##7J_T#nhbEQEH4GFmD|C!^2b3WRlj6{ zeBlbgUPJj03k}Vw-C7~CiF9mx>z|H{b&tX+YV5(AhLu|;$O}Ge;Qud1Mw1b43as6! cxxel&caN@kw))ErIiQ}8r>mdKI;Vst05oc}+W-In From eb684ee933da1216b5aa7b8b6383928d691805f5 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 17:22:49 +0200 Subject: [PATCH 47/76] Fix typo's --- CHANGELOG.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5049cf141..ba1a824cb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,14 @@ ### 0.5 **Bugfixes** -- Fix clicking sound in Grid -- Fix NPE in Grid while sorting -- Fix exporter not exporting is some cases -- Fix importer not importing in some cases -- Fix controller drawing RF every 20 ticks instead of every tick -- Fix not being able to shift click from Crafting Grid crafting slots -- Fix crash with interfaces -- Check if the Contructor can actually place said block in the world +- Fixed clicking sound in Grid +- Fixed NPE in Grid while sorting +- Fixed exporter not exporting is some cases +- Fixed importer not importing in some cases +- Fixed controller drawing RF every 20 ticks instead of every tick +- Fixed not being able to shift click from Crafting Grid crafting slots +- Fixed crash with interfaces +- Check if the Constructor can actually place said block in the world **Features** - New textures From 679c5bedb420085db7dff1110b958b3a10d2976c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 27 Mar 2016 17:31:25 +0200 Subject: [PATCH 48/76] Update LICENSE --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index e50d002c2..9eb0eb0e1 100755 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License (MIT) -Copyright © 2015 - 2016 Raoul Van den Berge +Copyright © 2015 - 2016 Refined Storage contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation From b3ef81b9c25f41d6ad41b208625bf06013f20cfa Mon Sep 17 00:00:00 2001 From: Raoul Date: Sun, 27 Mar 2016 18:39:20 +0200 Subject: [PATCH 49/76] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 464292122..cba6a1657 100755 --- a/README.md +++ b/README.md @@ -2,4 +2,10 @@ A Minecraft mod all about storage. -[Check this project out on CurseForge](http://minecraft.curseforge.com/projects/refined-storage). +This project is available on [CurseForge](http://minecraft.curseforge.com/projects/refined-storage). + +## What are you interested in? + +- [How this mod works and how to use it](https://github.com/raoulvdberge/refinedstorage/wiki) +- [Reporting a bug](https://github.com/raoulvdberge/refinedstorage/issues) +- [Sending a feature request](https://github.com/raoulvdberge/refinedstorage/issues) From 22a21aaa66ef17595858467174856cec713b1e4a Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 06:57:45 +0200 Subject: [PATCH 50/76] Fixes crash [06:55:08] [Server thread/ERROR]: Encountered an unexpected exception net.minecraft.util.ReportedException: Ticking block entity at net.minecraft.server.MinecraftServer.updateTimeLightAndEntities(MinecraftServer.java:785) ~[MinecraftServer.class:?] at net.minecraft.server.dedicated.DedicatedServer.updateTimeLightAndEntities(DedicatedServer.java:407) ~[DedicatedServer.class:?] at net.minecraft.server.MinecraftServer.tick(MinecraftServer.java:683) ~[MinecraftServer.class:?] at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:532) [MinecraftServer.class:?] at java.lang.Thread.run(Unknown Source) [?:1.8.0_71] Caused by: java.lang.NoSuchFieldError: stored at refinedstorage.tile.TileExternalStorage.(TileExternalStorage.java:37) ~[TileExternalStorage.class:?] at refinedstorage.block.BlockExternalStorage.createTileEntity(BlockExternalStorage.java:22) ~[BlockExternalStorage.class:?] at net.minecraft.world.chunk.Chunk.createNewTileEntity(Chunk.java:811) ~[Chunk.class:?] at net.minecraft.world.chunk.Chunk.getTileEntity(Chunk.java:828) ~[Chunk.class:?] at net.minecraft.world.World.getTileEntity(World.java:2571) ~[World.class:?] at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:22) ~[MachineSearcher.class:?] at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?] at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?] at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?] at refinedstorage.tile.MachineSearcher.search(MachineSearcher.java:43) ~[MachineSearcher.class:?] at refinedstorage.tile.TileController.update(TileController.java:61) ~[TileController.class:?] at net.minecraft.world.World.updateEntities(World.java:1936) ~[World.class:?] at net.minecraft.world.WorldServer.updateEntities(WorldServer.java:637) ~[WorldServer.class:?] at net.minecraft.server.MinecraftServer.updateTimeLightAndEntities(MinecraftServer.java:779) ~[MinecraftServer.class:?] ... 4 more --- src/main/java/refinedstorage/tile/TileExternalStorage.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 9fa0e4abc..c6d4d2c3b 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -34,8 +34,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider private int compare = 0; private int mode = 0; - @SideOnly(Side.CLIENT) - private int stored = 0; + private int stored = 0; @Override public int getEnergyUsage() { From fc537451572c78c3b1e6081a2f94efccff267985 Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 07:06:36 +0200 Subject: [PATCH 51/76] Update TileMachine.java null pointer on worldObj --- src/main/java/refinedstorage/tile/TileMachine.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index e82e6250c..aa9d8f50e 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -19,7 +19,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed private Block originalBlock; public void onConnected(TileController controller) { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { markDirty(); connected = true; @@ -31,7 +31,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed } public void onDisconnected() { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + if (worldObj != null && worldObj.getBlockState(pos).getBlock() == originalBlock) { markDirty(); connected = false; @@ -42,6 +42,12 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void update() { + if(worldObj == null) + { + super.update(); + return; + } + if (ticks == 0) { originalBlock = worldObj.getBlockState(pos).getBlock(); } From 3e08be85e7e7044d83a32a943e3505852357011b Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 07:08:01 +0200 Subject: [PATCH 52/76] style change --- src/main/java/refinedstorage/tile/TileMachine.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index aa9d8f50e..25b3dd24e 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -42,8 +42,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void update() { - if(worldObj == null) - { + if(worldObj == null) { super.update(); return; } From 84c4485b7f3ba7779c6263ea70790e2423ba193b Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 07:18:09 +0200 Subject: [PATCH 53/76] Update TileExternalStorage.java --- src/main/java/refinedstorage/tile/TileExternalStorage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index c6d4d2c3b..3b4e87e9e 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -163,6 +163,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } public TileEntity getConnectedTile() { + if(worldObj == null) return null; TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { From ac930f0d455b43324260e4c6454b9689ba42c445 Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 08:20:05 +0200 Subject: [PATCH 54/76] Fixes nullPointer in GuiGrid ? Think instead of all these null checks, maybe not set that list from the network packet as that is another thread, and instead set a temporary list that the gui forground then pull into the main list before rendering. --- src/main/java/refinedstorage/gui/GuiGrid.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index a42316d84..918cf7ee8 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -133,7 +133,9 @@ public class GuiGrid extends GuiBase { for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (slot < items.size()) { - int qty = items.get(slot).getQuantity(); + StorageItem storageItem = items.get(slot); + if(storageItem == null) continue; + int qty = storageItem.getQuantity(); String text; From d5215a5396c991f8b528bf4a497e31a2d219f595 Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 08:49:06 +0200 Subject: [PATCH 55/76] Correct RF usage, Use energy every tick not every sec Moved Energy usage outside the ticks % 20 block, amount to draw is updated every sec as before --- .../refinedstorage/tile/TileController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 2c1e5d23d..4b2c5bd50 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -49,6 +49,15 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!worldObj.isRemote) { int lastEnergy = energy.getEnergyStored(); + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; + } + if (ticks % 20 == 0) { if (!isActive()) { disconnectAll(); @@ -99,15 +108,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor } } - switch (getType()) { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } - if (lastEnergy != energy.getEnergyStored()) { worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); } From 4446313ac1ceef1bca35b37d82b553e76e5d5123 Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 09:07:12 +0200 Subject: [PATCH 56/76] better fix --- src/main/java/refinedstorage/gui/GuiGrid.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 918cf7ee8..8e8362b2e 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -111,7 +111,7 @@ public class GuiGrid extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); - + synchronized (grid.getController()) { drawString(7, 7, t("gui.refinedstorage:grid")); if (grid.getType() == EnumGridType.CRAFTING) { @@ -133,9 +133,7 @@ public class GuiGrid extends GuiBase { for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (slot < items.size()) { - StorageItem storageItem = items.get(slot); - if(storageItem == null) continue; - int qty = storageItem.getQuantity(); + int qty = items.get(slot).getQuantity(); String text; @@ -192,6 +190,7 @@ public class GuiGrid extends GuiBase { drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); } } + } public List getItems() { List items = new ArrayList(); From 66df388db3912b5c3038b90516ea55c52cf07ccf Mon Sep 17 00:00:00 2001 From: tomevoll Date: Mon, 28 Mar 2016 09:21:53 +0200 Subject: [PATCH 57/76] only draw power if it has power and is active --- src/main/java/refinedstorage/tile/TileController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 4b2c5bd50..608c27c6c 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -49,6 +49,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!worldObj.isRemote) { int lastEnergy = energy.getEnergyStored(); + if(isActive()) switch (getType()) { case NORMAL: energy.extractEnergy(energyUsage, false); From a12f25761e7009d4476d545a336617517eb12fe5 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 11:07:13 +0200 Subject: [PATCH 58/76] Code style fixes --- src/main/java/refinedstorage/gui/GuiGrid.java | 131 +++++++++--------- .../refinedstorage/tile/TileController.java | 25 ++-- .../tile/TileExternalStorage.java | 7 +- .../java/refinedstorage/tile/TileMachine.java | 2 +- 4 files changed, 84 insertions(+), 81 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 8e8362b2e..a0f8b47da 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -111,85 +111,86 @@ public class GuiGrid extends GuiBase { @Override public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); - synchronized (grid.getController()) { - drawString(7, 7, t("gui.refinedstorage:grid")); - if (grid.getType() == EnumGridType.CRAFTING) { - drawString(7, 94, t("container.crafting")); - } + synchronized (grid.getController()) { + drawString(7, 7, t("gui.refinedstorage:grid")); - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); - - int x = 8; - int y = 20; - - List items = getItems(); - - hoveringSlotId = -1; - - int slot = getOffset() * 9; - - RenderHelper.enableGUIStandardItemLighting(); - - for (int i = 0; i < 9 * getVisibleRows(); ++i) { - if (slot < items.size()) { - int qty = items.get(slot).getQuantity(); - - String text; - - if (qty >= 1000000) { - text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; - } else if (qty >= 1000) { - text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; - } else if (qty == 1) { - text = null; - } else { - text = String.valueOf(qty); - } - - drawItem(x, y, items.get(slot).toItemStack(), true, text); + if (grid.getType() == EnumGridType.CRAFTING) { + drawString(7, 94, t("container.crafting")); } - if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { - hoveringSlotId = slot; + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); + int x = 8; + int y = 20; + + List items = getItems(); + + hoveringSlotId = -1; + + int slot = getOffset() * 9; + + RenderHelper.enableGUIStandardItemLighting(); + + for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (slot < items.size()) { - // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); + int qty = items.get(slot).getQuantity(); + + String text; + + if (qty >= 1000000) { + text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; + } else if (qty >= 1000) { + text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; + } else if (qty == 1) { + text = null; + } else { + text = String.valueOf(qty); + } + + drawItem(x, y, items.get(slot).toItemStack(), true, text); } - int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlotId = slot; - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - zLevel = 190; - GlStateManager.colorMask(true, true, true, false); - drawGradientRect(x, y, x + 16, y + 16, color, color); - zLevel = 0; - GlStateManager.colorMask(true, true, true, true); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); + if (slot < items.size()) { + // We need to use the ID, because if we filter, the client-side index will change + // while the serverside's index will still be the same. + hoveringId = items.get(slot).getId(); + } + + int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; + + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + zLevel = 190; + GlStateManager.colorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, color, color); + zLevel = 0; + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); + } + + slot++; + + x += 18; + + if ((i + 1) % 9 == 0) { + x = 8; + y += 18; + } } - slot++; + if (isHoveringOverValidSlot(items)) { + drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); + } - x += 18; - - if ((i + 1) % 9 == 0) { - x = 8; - y += 18; + if (isHoveringOverClear(mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); } } - - if (isHoveringOverValidSlot(items)) { - drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); - } - - if (isHoveringOverClear(mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); - } - } } public List getItems() { diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 608c27c6c..94d06d9d3 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -49,16 +49,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (!worldObj.isRemote) { int lastEnergy = energy.getEnergyStored(); - if(isActive()) - switch (getType()) { - case NORMAL: - energy.extractEnergy(energyUsage, false); - break; - case CREATIVE: - energy.setEnergyStored(energy.getMaxEnergyStored()); - break; - } - if (ticks % 20 == 0) { if (!isActive()) { disconnectAll(); @@ -108,11 +98,22 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor energyUsage += machine.getEnergyUsage(); } } + } - if (lastEnergy != energy.getEnergyStored()) { - worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); + if (isActive()) { + switch (getType()) { + case NORMAL: + energy.extractEnergy(energyUsage, false); + break; + case CREATIVE: + energy.setEnergyStored(energy.getMaxEnergyStored()); + break; } } + + if (lastEnergy != energy.getEnergyStored()) { + worldObj.updateComparatorOutputLevel(pos, RefinedStorageBlocks.CONTROLLER); + } } } diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index 3b4e87e9e..b37b8aff2 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -5,8 +5,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; import refinedstorage.inventory.InventorySimple; @@ -163,7 +161,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider } public TileEntity getConnectedTile() { - if(worldObj == null) return null; + if (worldObj == null) { + return null; + } + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) { diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index 25b3dd24e..79fe407ad 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -42,7 +42,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void update() { - if(worldObj == null) { + if (worldObj == null) { super.update(); return; } From f88889765f26a02358abaf5b3b97bfdd5675d4c5 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 11:52:08 +0200 Subject: [PATCH 59/76] Shift on item in grid displays the real count --- src/main/java/refinedstorage/gui/GuiGrid.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index a0f8b47da..fc5177797 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -133,6 +133,16 @@ public class GuiGrid extends GuiBase { RenderHelper.enableGUIStandardItemLighting(); for (int i = 0; i < 9 * getVisibleRows(); ++i) { + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlotId = slot; + + if (slot < items.size()) { + // We need to use the ID, because if we filter, the client-side index will change + // while the serverside's index will still be the same. + hoveringId = items.get(slot).getId(); + } + } + if (slot < items.size()) { int qty = items.get(slot).getQuantity(); @@ -148,18 +158,14 @@ public class GuiGrid extends GuiBase { text = String.valueOf(qty); } + if (hoveringSlotId == slot && GuiScreen.isShiftKeyDown()) { + text = String.valueOf(qty); + } + drawItem(x, y, items.get(slot).toItemStack(), true, text); } if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { - hoveringSlotId = slot; - - if (slot < items.size()) { - // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); - } - int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; GlStateManager.disableLighting(); From 2a7279ae8700466a344523395959336eed33c49b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 14:17:32 +0200 Subject: [PATCH 60/76] Can't go over 32 when getting half.. --- src/main/java/refinedstorage/network/MessageStoragePull.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java index 0896bd482..23a089b79 100755 --- a/src/main/java/refinedstorage/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -68,8 +68,8 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer 1) { quantity = item.getQuantity() / 2; - if (quantity > 64) { - quantity = 64; + if (quantity > 32) { + quantity = 32; } } else if (message.one) { quantity = 1; From 1a8be231edc247aa5b9cc2e0cbe353e283cc651c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 17:32:24 +0200 Subject: [PATCH 61/76] Simplify wireless grid --- .../refinedstorage/RefinedStorageBlocks.java | 1 - .../refinedstorage/RefinedStorageGui.java | 1 - .../refinedstorage/RefinedStorageItems.java | 1 - .../block/BlockWirelessTransmitter.java | 55 ---- .../ContainerWirelessTransmitter.java | 50 ---- .../java/refinedstorage/gui/GuiHandler.java | 4 - .../gui/GuiWirelessTransmitter.java | 49 ---- .../refinedstorage/item/ItemWirelessGrid.java | 79 +++--- .../item/ItemWirelessGridPlate.java | 9 - .../refinedstorage/proxy/ClientProxy.java | 3 - .../refinedstorage/proxy/CommonProxy.java | 22 +- .../tile/TileExternalStorage.java | 2 +- .../java/refinedstorage/tile/TileMachine.java | 2 +- .../tile/TileWirelessTransmitter.java | 235 ------------------ .../solderer/SoldererRecipeWirelessGrid.java | 37 --- .../blockstates/wireless_transmitter.json | 56 ----- .../assets/refinedstorage/lang/en_US.lang | 19 +- .../assets/refinedstorage/lang/nl_NL.lang | 19 +- .../textures/blocks/wireless_transmitter.png | Bin 382 -> 0 bytes .../blocks/wireless_transmitter_side.png | Bin 326 -> 0 bytes .../wireless_transmitter_side_working.png | Bin 324 -> 0 bytes .../blocks/wireless_transmitter_working.png | Bin 380 -> 0 bytes .../items/wireless_grid_disconnected.png | Bin 628 -> 615 bytes .../textures/items/wireless_grid_plate.png | Bin 615 -> 0 bytes 24 files changed, 54 insertions(+), 590 deletions(-) delete mode 100755 src/main/java/refinedstorage/block/BlockWirelessTransmitter.java delete mode 100755 src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java delete mode 100755 src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java delete mode 100755 src/main/java/refinedstorage/item/ItemWirelessGridPlate.java delete mode 100755 src/main/java/refinedstorage/tile/TileWirelessTransmitter.java delete mode 100755 src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java delete mode 100755 src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png diff --git a/src/main/java/refinedstorage/RefinedStorageBlocks.java b/src/main/java/refinedstorage/RefinedStorageBlocks.java index 1d717ec22..a8b95f579 100755 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -13,7 +13,6 @@ public final class RefinedStorageBlocks { public static final BlockDetector DETECTOR = new BlockDetector(); public static final BlockMachineCasing MACHINE_CASING = new BlockMachineCasing(); public static final BlockSolderer SOLDERER = new BlockSolderer(); - public static final BlockWirelessTransmitter WIRELESS_TRANSMITTER = new BlockWirelessTransmitter(); public static final BlockDestructor DESTRUCTOR = new BlockDestructor(); public static final BlockConstructor CONSTRUCTOR = new BlockConstructor(); public static final BlockStorage STORAGE = new BlockStorage(); diff --git a/src/main/java/refinedstorage/RefinedStorageGui.java b/src/main/java/refinedstorage/RefinedStorageGui.java index d9b975e50..646e4815e 100755 --- a/src/main/java/refinedstorage/RefinedStorageGui.java +++ b/src/main/java/refinedstorage/RefinedStorageGui.java @@ -8,7 +8,6 @@ public final class RefinedStorageGui { public static final int EXPORTER = 5; public static final int DETECTOR = 6; public static final int SOLDERER = 7; - public static final int WIRELESS_TRANSMITTER = 8; public static final int DESTRUCTOR = 9; public static final int CONSTRUCTOR = 10; public static final int STORAGE = 11; diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java index 39d5fc013..40f118d5b 100755 --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -5,7 +5,6 @@ import refinedstorage.item.*; public final class RefinedStorageItems { public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk(); public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid(); - public static final ItemWirelessGridPlate WIRELESS_GRID_PLATE = new ItemWirelessGridPlate(); public static final ItemQuartzEnrichedIron QUARTZ_ENRICHED_IRON = new ItemQuartzEnrichedIron(); public static final ItemCore CORE = new ItemCore(); public static final ItemSilicon SILICON = new ItemSilicon(); diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java deleted file mode 100755 index d7e17bd37..000000000 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ /dev/null @@ -1,55 +0,0 @@ -package refinedstorage.block; - -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; -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.IBlockAccess; -import net.minecraft.world.World; -import refinedstorage.RefinedStorage; -import refinedstorage.RefinedStorageGui; -import refinedstorage.tile.TileWirelessTransmitter; - -public class BlockWirelessTransmitter extends BlockMachine { - public static final PropertyBool WORKING = PropertyBool.create("working"); - - public BlockWirelessTransmitter() { - super("wireless_transmitter"); - } - - @Override - protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - WORKING - }); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - return super.getActualState(state, world, pos) - .withProperty(WORKING, ((TileWirelessTransmitter) world.getTileEntity(pos)).isWorking()); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) { - return new TileWirelessTransmitter(); - } - - @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(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_TRANSMITTER, world, pos.getX(), pos.getY(), pos.getZ()); - } - - return true; - } -} diff --git a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java deleted file mode 100755 index f2365e42b..000000000 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ /dev/null @@ -1,50 +0,0 @@ -package refinedstorage.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageItems; -import refinedstorage.container.slot.BasicItemValidator; -import refinedstorage.container.slot.SlotFiltered; -import refinedstorage.container.slot.SlotOutput; -import refinedstorage.tile.TileWirelessTransmitter; - -public class ContainerWirelessTransmitter extends ContainerBase { - public ContainerWirelessTransmitter(EntityPlayer player, TileWirelessTransmitter wirelessTransmitter) { - super(player); - - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 0, 8, 20, new BasicItemValidator(Items.ender_pearl))); - addSlotToContainer(new SlotFiltered(wirelessTransmitter, 1, 101, 20, new BasicItemValidator(RefinedStorageItems.WIRELESS_GRID))); - addSlotToContainer(new SlotOutput(wirelessTransmitter, 2, 152, 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().copy(); - - if (index < 3) { - if (!mergeItemStack(stack, 3, inventorySlots.size(), true)) { - return null; - } - } else if (!mergeItemStack(stack, 0, 3, false)) { - return null; - } - - if (stack.stackSize == 0) { - slot.putStack(null); - } else { - slot.onSlotChanged(); - } - } - - return stack; - } -} diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index c0bea9630..04f8ccf15 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -28,8 +28,6 @@ public class GuiHandler implements IGuiHandler { return new ContainerDetector(player, (TileDetector) tile); case RefinedStorageGui.SOLDERER: return new ContainerSolderer(player, (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new ContainerWirelessTransmitter(player, (TileWirelessTransmitter) tile); case RefinedStorageGui.DESTRUCTOR: return new ContainerDestructor(player, (TileDestructor) tile); case RefinedStorageGui.CONSTRUCTOR: @@ -69,8 +67,6 @@ public class GuiHandler implements IGuiHandler { return new GuiDetector((ContainerDetector) getContainer(ID, player, tile), (TileDetector) tile); case RefinedStorageGui.SOLDERER: return new GuiSolderer((ContainerSolderer) getContainer(ID, player, tile), (TileSolderer) tile); - case RefinedStorageGui.WIRELESS_TRANSMITTER: - return new GuiWirelessTransmitter((ContainerWirelessTransmitter) getContainer(ID, player, tile), (TileWirelessTransmitter) tile); case RefinedStorageGui.DESTRUCTOR: return new GuiDestructor((ContainerDestructor) getContainer(ID, player, tile), (TileDestructor) tile); case RefinedStorageGui.CONSTRUCTOR: diff --git a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java deleted file mode 100755 index a903f1f6b..000000000 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ /dev/null @@ -1,49 +0,0 @@ -package refinedstorage.gui; - -import refinedstorage.container.ContainerWirelessTransmitter; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; -import refinedstorage.tile.TileWirelessTransmitter; - -public class GuiWirelessTransmitter extends GuiBase { - private TileWirelessTransmitter wirelessTransmitter; - - public GuiWirelessTransmitter(ContainerWirelessTransmitter container, TileWirelessTransmitter wirelessTransmitter) { - super(container, 176, 137); - - this.wirelessTransmitter = wirelessTransmitter; - } - - @Override - public void init(int x, int y) { - addSideButton(new SideButtonRedstoneMode(wirelessTransmitter)); - } - - @Override - public void update(int x, int y) { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) { - bindTexture("gui/wireless_transmitter.png"); - - drawTexture(x, y, 0, 0, width, height); - - if (wirelessTransmitter.isWorking()) { - int progress = (int) ((float) wirelessTransmitter.getProgress() / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 14f); - - drawTexture(x + 36 - 1, y + 21 - 1 + progress, 178, progress, 14, 14); - } - } - - @Override - public void drawForeground(int mouseX, int mouseY) { - drawString(7, 7, t("gui.refinedstorage:wireless_transmitter")); - drawString(7, 43, t("container.inventory")); - - if (inBounds(36, 21, 14, 14, mouseX, mouseY) && wirelessTransmitter.isWorking()) { - int workRemaining = (int) (((float) (TileWirelessTransmitter.TOTAL_PROGRESS - wirelessTransmitter.getProgress())) / (float) TileWirelessTransmitter.TOTAL_PROGRESS * 100f); - - drawTooltip(mouseX, mouseY, workRemaining + "%"); - } - } -} diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index 884dcd931..25debec53 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -1,78 +1,75 @@ package refinedstorage.item; -import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.block.Block; 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.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageGui; -import refinedstorage.block.EnumGridType; import refinedstorage.tile.TileGrid; -import refinedstorage.tile.TileWirelessTransmitter; import java.util.List; public class ItemWirelessGrid extends ItemBase { - public static final String NBT_WIRELESS_TRANSMITTER_X = "WirelessTransmitterX"; - public static final String NBT_WIRELESS_TRANSMITTER_Y = "WirelessTransmitterY"; - public static final String NBT_WIRELESS_TRANSMITTER_Z = "WirelessTransmitterZ"; + public static final String NBT_GRID_X = "GridX"; + public static final String NBT_GRID_Y = "GridY"; + public static final String NBT_GRID_Z = "GridZ"; public ItemWirelessGrid() { super("wireless_grid"); setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - list.add(new ItemStack(item, 1, 0)); - list.add(new ItemStack(item, 1, 1)); } @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { if (isValid(stack)) { - list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.0", getX(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.1", getY(stack))); + list.add(I18n.translateToLocalFormatted("misc.refinedstorage:wireless_grid.tooltip.2", getZ(stack))); } } + @Override + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + Block block = worldIn.getBlockState(pos).getBlock(); + + if (block == RefinedStorageBlocks.GRID) { + NBTTagCompound tag = new NBTTagCompound(); + + tag.setInteger(NBT_GRID_X, pos.getX()); + tag.setInteger(NBT_GRID_Y, pos.getY()); + tag.setInteger(NBT_GRID_Z, pos.getZ()); + + stack.setTagCompound(tag); + + return EnumActionResult.SUCCESS; + } + + return EnumActionResult.PASS; + } + @Override public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote) { if (isValid(stack)) { if (isInRange(stack, player)) { - int x = getX(stack); - int y = getY(stack); - int z = getZ(stack); + TileEntity tile = world.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))); - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + if (tile instanceof TileGrid) { + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ()); - if (tile instanceof TileWirelessTransmitter) { - TileWirelessTransmitter wirelessTransmitter = (TileWirelessTransmitter) tile; - - if (wirelessTransmitter.isWorking()) { - TileGrid grid = wirelessTransmitter.getGrid(stack.getItemDamage() == 1 ? EnumGridType.CRAFTING : EnumGridType.NORMAL); - - if (grid == null) { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.no_grid." + stack.getItemDamage()))); - } else { - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ()); - - return new ActionResult(EnumActionResult.SUCCESS, stack); - } - } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_working"))); - } + return new ActionResult(EnumActionResult.PASS, stack); } else { player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); } @@ -80,7 +77,7 @@ public class ItemWirelessGrid extends ItemBase { player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.out_of_range"))); } } else { - player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_set." + stack.getItemDamage()))); + player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.refinedstorage:wireless_grid.not_found"))); } return new ActionResult(EnumActionResult.FAIL, stack); @@ -90,15 +87,15 @@ public class ItemWirelessGrid extends ItemBase { } public static int getX(ItemStack stack) { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); + return stack.getTagCompound().getInteger(NBT_GRID_X); } public static int getY(ItemStack stack) { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); + return stack.getTagCompound().getInteger(NBT_GRID_Y); } public static int getZ(ItemStack stack) { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Z); + return stack.getTagCompound().getInteger(NBT_GRID_Z); } public static boolean isInRange(ItemStack stack, EntityPlayer player) { @@ -106,6 +103,6 @@ public class ItemWirelessGrid extends ItemBase { } public static boolean isValid(ItemStack stack) { - return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_X) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Y) && stack.getTagCompound().hasKey(NBT_WIRELESS_TRANSMITTER_Z); + return stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_GRID_X) && stack.getTagCompound().hasKey(NBT_GRID_Y) && stack.getTagCompound().hasKey(NBT_GRID_Z); } } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java b/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java deleted file mode 100755 index 23f2308ca..000000000 --- a/src/main/java/refinedstorage/item/ItemWirelessGridPlate.java +++ /dev/null @@ -1,9 +0,0 @@ -package refinedstorage.item; - -public class ItemWirelessGridPlate extends ItemBase { - public ItemWirelessGridPlate() { - super("wireless_grid_plate"); - - setMaxStackSize(1); - } -} diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 31cf95696..1422444f7 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -84,8 +84,6 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_CONSTRUCTION, new ModelResourceLocation("refinedstorage:construction_core", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.CORE, ItemCore.TYPE_DESTRUCTION, new ModelResourceLocation("refinedstorage:destruction_core", "inventory")); - ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.WIRELESS_GRID_PLATE, 0, new ModelResourceLocation("refinedstorage:wireless_grid_plate", "inventory")); - ModelLoader.setCustomMeshDefinition(RefinedStorageItems.WIRELESS_GRID, new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { @@ -111,7 +109,6 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index fa5847c7f..88385fbb3 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -50,7 +50,6 @@ public class CommonProxy { GameRegistry.registerTileEntity(TileExporter.class, ID + ":exporter"); GameRegistry.registerTileEntity(TileDetector.class, ID + ":detector"); GameRegistry.registerTileEntity(TileSolderer.class, ID + ":solderer"); - GameRegistry.registerTileEntity(TileWirelessTransmitter.class, ID + ":wireless_transmitter"); GameRegistry.registerTileEntity(TileDestructor.class, ID + ":destructor"); GameRegistry.registerTileEntity(TileConstructor.class, ID + ":constructor"); GameRegistry.registerTileEntity(TileStorage.class, ID + ":storage"); @@ -67,7 +66,6 @@ public class CommonProxy { GameRegistry.registerBlock(RefinedStorageBlocks.DETECTOR, ID + ":detector"); GameRegistry.registerBlock(RefinedStorageBlocks.MACHINE_CASING, ID + ":machine_casing"); GameRegistry.registerBlock(RefinedStorageBlocks.SOLDERER, ID + ":solderer"); - GameRegistry.registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER, ID + ":wireless_transmitter"); GameRegistry.registerBlock(RefinedStorageBlocks.DESTRUCTOR, ID + ":destructor"); GameRegistry.registerBlock(RefinedStorageBlocks.CONSTRUCTOR, ID + ":constructor"); GameRegistry.registerBlock(RefinedStorageBlocks.STORAGE, ItemBlockStorage.class, ID + ":storage"); @@ -76,7 +74,6 @@ public class CommonProxy { GameRegistry.registerItem(RefinedStorageItems.STORAGE_DISK, ID + ":storage_disk"); GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID, ID + ":wireless_grid"); - GameRegistry.registerItem(RefinedStorageItems.WIRELESS_GRID_PLATE, ID + ":wireless_grid_plate"); GameRegistry.registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON, ID + ":quartz_enriched_iron"); GameRegistry.registerItem(RefinedStorageItems.CORE, ID + ":core"); GameRegistry.registerItem(RefinedStorageItems.SILICON, ID + ":silicon"); @@ -181,19 +178,8 @@ public class CommonProxy { // Crafting Grid SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid()); - // Wireless Transmitter - GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.WIRELESS_TRANSMITTER), - "EPE", - "EME", - "EAE", - 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), - 'A', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), - 'P', new ItemStack(Items.ender_pearl), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING) - ); - - // Wireless Grid Plate - GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE), + // Wireless Grid + GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID), " P ", "ERE", "EEE", @@ -202,10 +188,6 @@ public class CommonProxy { 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON) ); - // Wireless Grid - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(0)); - SoldererRegistry.addRecipe(new SoldererRecipeWirelessGrid(1)); - // External Storage GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.EXTERNAL_STORAGE), "CED", diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index b37b8aff2..5f679363f 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -32,7 +32,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider private int compare = 0; private int mode = 0; - private int stored = 0; + private int stored = 0; @Override public int getEnergyUsage() { diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index 79fe407ad..c7d6f4c55 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -46,7 +46,7 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed super.update(); return; } - + if (ticks == 0) { originalBlock = worldObj.getBlockState(pos).getBlock(); } diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java deleted file mode 100755 index 3c8743f1a..000000000 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ /dev/null @@ -1,235 +0,0 @@ -package refinedstorage.tile; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.text.ITextComponent; -import refinedstorage.block.EnumGridType; -import refinedstorage.inventory.InventorySimple; -import refinedstorage.item.ItemWirelessGrid; -import refinedstorage.util.InventoryUtils; - -public class TileWirelessTransmitter extends TileMachine implements IInventory { - public static final int TOTAL_PROGRESS = 10000; - - public static final String NBT_WORKING = "Working"; - public static final String NBT_PROGRESS = "Progress"; - - private InventorySimple inventory = new InventorySimple("wirelessTransmitter", 3, this); - - private boolean working = false; - private int progress = 0; - - @Override - public int getEnergyUsage() { - return 3; - } - - @Override - public void updateMachine() { - if (working) { - progress++; - - if (progress == TOTAL_PROGRESS) { - reset(); - } - } else if (inventory.getStackInSlot(0) != null) { - inventory.decrStackSize(0, 1); - - progress = 0; - working = true; - - markDirty(); - } - - if (inventory.getStackInSlot(1) != null) { - ItemStack slot = inventory.getStackInSlot(1); - - slot.setTagCompound(new NBTTagCompound()); - - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_X, pos.getX()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Y, pos.getY()); - slot.getTagCompound().setInteger(ItemWirelessGrid.NBT_WIRELESS_TRANSMITTER_Z, pos.getZ()); - - inventory.setInventorySlotContents(2, slot); - inventory.setInventorySlotContents(1, null); - } - } - - public void reset() { - progress = 0; - working = false; - - markDirty(); - } - - @Override - public void onDisconnected() { - super.onDisconnected(); - - reset(); - } - - public boolean isWorking() { - return working; - } - - public int getProgress() { - return progress; - } - - public TileGrid getGrid(EnumGridType type) { - for (TileMachine machine : getController().getMachines()) { - if (worldObj.getTileEntity(machine.getPos()) != null) { - if (machine instanceof TileGrid) { - TileGrid grid = (TileGrid) machine; - - if (grid.getType() == type) { - return grid; - } - } - } - } - - return null; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(this, 0, nbt); - - if (nbt.hasKey(NBT_WORKING)) { - working = nbt.getBoolean(NBT_WORKING); - } - - if (nbt.hasKey(NBT_PROGRESS)) { - progress = nbt.getInteger(NBT_PROGRESS); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(this, 0, nbt); - - nbt.setBoolean(NBT_WORKING, working); - nbt.setInteger(NBT_PROGRESS, progress); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - - boolean lastWorking = working; - - working = buf.readBoolean(); - progress = buf.readInt(); - - if (lastWorking != working) { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - - buf.writeBoolean(working); - buf.writeInt(progress); - } - - @Override - public IInventory getDroppedInventory() { - return inventory; - } - - @Override - public int getSizeInventory() { - return inventory.getSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return inventory.getStackInSlot(slot); - } - - @Override - public ItemStack decrStackSize(int slot, int count) { - return inventory.decrStackSize(slot, count); - } - - @Override - public ItemStack removeStackFromSlot(int slot) { - return inventory.removeStackFromSlot(slot); - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) { - inventory.setInventorySlotContents(slot, stack); - } - - @Override - public int getInventoryStackLimit() { - return inventory.getInventoryStackLimit(); - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - return inventory.isUseableByPlayer(player); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) { - return inventory.isItemValidForSlot(slot, stack); - } - - @Override - public void openInventory(EntityPlayer player) { - inventory.openInventory(player); - } - - @Override - public void closeInventory(EntityPlayer player) { - inventory.closeInventory(player); - } - - @Override - public int getField(int id) { - return inventory.getField(id); - } - - @Override - public void setField(int id, int value) { - inventory.setField(id, value); - } - - @Override - public int getFieldCount() { - return inventory.getFieldCount(); - } - - @Override - public void clear() { - inventory.clear(); - } - - @Override - public String getName() { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() { - return inventory.getDisplayName(); - } -} diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java deleted file mode 100755 index 300af3529..000000000 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java +++ /dev/null @@ -1,37 +0,0 @@ -package refinedstorage.tile.solderer; - -import net.minecraft.item.ItemStack; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageItems; -import refinedstorage.item.ItemProcessor; - -public class SoldererRecipeWirelessGrid implements ISoldererRecipe { - private int type; - - public SoldererRecipeWirelessGrid(int type) { - this.type = type; - } - - @Override - public ItemStack getRow(int row) { - if (row == 0) { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID_PLATE); - } else if (row == 1) { - return new ItemStack(RefinedStorageBlocks.GRID, 1, type); - } else if (row == 2) { - return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED); - } - - return null; - } - - @Override - public ItemStack getResult() { - return new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, type); - } - - @Override - public int getDuration() { - return 1000; - } -} diff --git a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json deleted file mode 100755 index a249b0c7d..000000000 --- a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "orientable", - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side", - "top": "refinedstorage:blocks/wireless_transmitter_side", - "front": "refinedstorage:blocks/wireless_transmitter" - } - }, - "variants": { - "inventory": [ - { - "y": 0, - "transform": "forge:default-block" - } - ], - "connected": { - "true": { - }, - "false": { - } - }, - "direction": { - "north": { - "y": 0 - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - }, - "working": { - "true": { - "textures": { - "side": "refinedstorage:blocks/wireless_transmitter_side_working", - "top": "refinedstorage:blocks/wireless_transmitter_side_working", - "front": "refinedstorage:blocks/wireless_transmitter_working" - } - }, - "false": { - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 4bbc86804..368495c67 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -12,7 +12,6 @@ gui.refinedstorage:importer=Importer gui.refinedstorage:exporter=Exporter gui.refinedstorage:detector=Detector gui.refinedstorage:solderer=Solderer -gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:destructor=Destructor gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relay @@ -32,14 +31,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% full -misc.refinedstorage:wireless_grid.tooltip=Bound to %d, %d, %d. -misc.refinedstorage:wireless_grid.not_working=The Wireless Transmitter is disabled or out of fuel. -misc.refinedstorage:wireless_grid.not_found=The Wireless Transmitter is not found. -misc.refinedstorage:wireless_grid.not_set.0=This Wireless Grid is not bound to a Wireless Transmitter yet. -misc.refinedstorage:wireless_grid.not_set.1=This Wireless Crafting Grid is not bound to a Wireless Transmitter yet. -misc.refinedstorage:wireless_grid.out_of_range=The Wireless Transmitter is out of range. -misc.refinedstorage:wireless_grid.no_grid.0=There is no Grid found in the network. You need to place a Grid before you can use the Wireless Grid! -misc.refinedstorage:wireless_grid.no_grid.1=There is no Crafting Grid found in the network. You need to place a Crafting Grid before you can use the Wireless Crafting Grid! +misc.refinedstorage:wireless_grid.tooltip.0=X: %d +misc.refinedstorage:wireless_grid.tooltip.1=Y: %d +misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.out_of_range=Grid out of range. +misc.refinedstorage:wireless_grid.not_found=Grid not found. misc.refinedstorage:yes=Yes misc.refinedstorage:no=No @@ -83,7 +79,6 @@ block.refinedstorage:exporter.name=Exporter block.refinedstorage:detector.name=Detector block.refinedstorage:machine_casing.name=Machine Casing block.refinedstorage:solderer.name=Solderer -block.refinedstorage:wireless_transmitter.name=Wireless Transmitter block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor block.refinedstorage:storage.0.name=1k Storage Block @@ -99,9 +94,7 @@ item.refinedstorage:storage_disk.1.name=4k Storage Disk item.refinedstorage:storage_disk.2.name=16k Storage Disk item.refinedstorage:storage_disk.3.name=64k Storage Disk item.refinedstorage:storage_disk.4.name=Creative Storage Disk -item.refinedstorage:wireless_grid.0.name=Wireless Grid -item.refinedstorage:wireless_grid.1.name=Wireless Crafting Grid -item.refinedstorage:wireless_grid_plate.name=Wireless Grid Plate +item.refinedstorage:wireless_grid.name=Wireless Grid item.refinedstorage:quartz_enriched_iron.name=Quartz Enriched Iron item.refinedstorage:core.0.name=Construction Core item.refinedstorage:core.1.name=Destruction Core diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 28db69375..e2135d7c1 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -12,7 +12,6 @@ gui.refinedstorage:importer=Importeur gui.refinedstorage:exporter=Exporteur gui.refinedstorage:detector=Detector gui.refinedstorage:solderer=Soldeerder -gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:destructor=Destructor gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relais @@ -32,14 +31,11 @@ misc.refinedstorage:storage.stored_minimal=%d misc.refinedstorage:storage.stored_capacity_minimal=%d / %d misc.refinedstorage:storage.full=%d%% vol -misc.refinedstorage:wireless_grid.tooltip=Gebonden aan %d, %d, %d. -misc.refinedstorage:wireless_grid.not_working=De Draadloze Zender is uit of zonder brandstof gevallen. -misc.refinedstorage:wireless_grid.not_found=De Draadloze Zender werd niet gevonden. -misc.refinedstorage:wireless_grid.not_set.0=Dit Draadloos Rooster is nog niet gebonden aan een Draadloze Zender. -misc.refinedstorage:wireless_grid.not_set.1=Dit Draadloos Crafting Rooster is nog niet gebonden aan een Draadloze Zender. -misc.refinedstorage:wireless_grid.out_of_range=De Draadloze Zender is buiten bereik. -misc.refinedstorage:wireless_grid.no_grid.0=Er is geen Rooster gevonden in het netwerk. Je moet eerst een Rooster plaatsen voor je het Draadloze Rooster kunt gebruiken. -misc.refinedstorage:wireless_grid.no_grid.1=Er is geen Crafting Rooster gevonden in het netwerk. Je moet eerst een Crafting Rooster plaatsen voor je het Draadloze Crafting Rooster kunt gebruiken. +misc.refinedstorage:wireless_grid.tooltip.0=X: %d +misc.refinedstorage:wireless_grid.tooltip.1=Y: %d +misc.refinedstorage:wireless_grid.tooltip.2=Z: %d +misc.refinedstorage:wireless_grid.out_of_range=Rooster buiten bereik. +misc.refinedstorage:wireless_grid.not_found=Rooster werd niet gevonden. misc.refinedstorage:yes=Ja misc.refinedstorage:no=Nee @@ -83,7 +79,6 @@ block.refinedstorage:exporter.name=Exporteur block.refinedstorage:detector.name=Detector block.refinedstorage:machine_casing.name=Machine-omhulsel block.refinedstorage:solderer.name=Soldeerder -block.refinedstorage:wireless_transmitter.name=Draadloze Zender block.refinedstorage:destructor.name=Destructor block.refinedstorage:constructor.name=Constructor block.refinedstorage:storage.0.name=1k Opslag Blok @@ -99,9 +94,7 @@ item.refinedstorage:storage_disk.1.name=4k Opslagschijf item.refinedstorage:storage_disk.2.name=16k Opslagschijf item.refinedstorage:storage_disk.3.name=64k Opslagschijf item.refinedstorage:storage_disk.4.name=Creative Opslagschijf -item.refinedstorage:wireless_grid.0.name=Draadloze Rooster -item.refinedstorage:wireless_grid.1.name=Draadloze Crafting Rooster -item.refinedstorage:wireless_grid_plate.name=Draadloze Rooster Bord +item.refinedstorage:wireless_grid.name=Draadloze Rooster item.refinedstorage:quartz_enriched_iron.name=Quartz Verrijkt Iron item.refinedstorage:core.0.name=Constructie Core item.refinedstorage:core.1.name=Destructie Core diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter.png deleted file mode 100755 index c2ed3bfd895fd9255a79f608d771920e3551e5e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3-g~+@hFJL5p3N?6G7xA>G`qg^$8For1xgi+P8+_i%iTKN_UlsPwkxZi z+oYdR`OJGTc!Aa2cg%S{_K6vD;?8T<<|=gQ{Hl#FRppWPZMc8*qtgk#BZa)z-2!zb z@|X@k;@Rze)8necwA`1Mx2*M> zmG@^=!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t15lOW{II1_BLoU*AM2}N;vFQ;E*CWGhLkgE^HYbW%ocooXdOJ9)q4BxtI&QPzBW^r3 z^}o-5ZgD%H!1Fyuz@tovXVHqk#Sab@Ff^-J^2$E02yhe^5LG- zICGQ_G)#z&5A?8VWc_e!iruNAD|3}u9>z0;ewC^U(t12uf?-D5CDkZRfil RY6AL)!PC{xWt~$(69A0kd8_~c diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_side_working.png deleted file mode 100755 index c75f638135000cb10a443eb7fe839692fbed90ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1Ax{^_ z5DWj>OUH$p3c3(#5=~{)**fRpj6)&s= zO?)+W{cFq&N|2be$@{vb*n!e%q2EL2WS&Zx!P>X^SLCg4Q=}3eR7ziGeXW_K%(id8 z>?fN<W2y&!@Ajx$z7iqr{BG^w$HGj Q3+NjLPgg&ebxsLQ0RJX=vj6}9 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_working.png deleted file mode 100755 index ea3fefb05ae235f144f80e5a6dd39c93341081fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3-g>$?hFJL5o_$%?WFXL%n0M{|y~!L}P22)aTgx`i4%@3%TX<~3s;_gN z^UO@yr)a^p>hepw2gkk$w;g-=bQ4Ty8k^i{LqGrEI(pp^jqFI$XqYT6}j5< zP|ZL_@8IEt4<*-sW-{`soa|bC@rC53Pp@=duaJ`HkAD&CI%&&}DZL@QDL18SXKlOc zc{zN4R)SIF<=d&3-T0f2IHB7k)kc(zT5?|Ch}_zyH9){l?O!0V1;({dm~* z>U8l@Vef^E$=jU57U^vNaH}_i>C3fut6r^(PwYvGD8KUcVEWsC(|ocR{=8$95E%>>9zu#T!jCJyOJcQ%% zIAXCF48ssGPb3mZCX+~|Qcj6mRBt3gp%CizI{wsZs9SY3n}1C~tJT8ac3U`|PCKRF zO?5yH1Oljhe4x|mpx^IfGMQj77+^RYO5S!v=tc<;E(gJ25Y=iG-EJ4-@mK`NqtQs1 z4wQhJg&r6|2j%xNdc7Xz^SNNTTnbO8Q#2Y4nF(uEW8Iw)fwwp5wqCEX*=(@e?S!}6 zEiB8D0YC3?34i$gew0cj%w{v}_j{a9Cjn!^at3U~4Y0d*pw7Yt3KR+jEEWqK4hI~M zM=ij(=G=~9{BZC*M6cJ2TrMYPR+|aN=kpn#)lWHsYAOQHiO=UlCX*2X)s;?E%o~bE ze>tUJ^?aG)K#9QzOGOb0N5a|x*>wvZk4Ju>#P5WN z+-^6qPA3$hlW_P;Ks(^)8FWE#pk4=Lg2y9N9R+OLe)$J^C6;yigmy~+0000Gp%fJt%5Is~hOtBs zqWwd95%&!j+`zjZ;QwgFyvXKNYtJFf%px-~UcBcEfdAk)j^O9_+wJ!Bow-}w?{|su zcpR}<42EF{SevGaL?VG?GO1dgN!>vr6biw%ZTziPVb^Rl8h;Hzv)M$e-Ikb2rBv(p zQa51?1Oh0(zoXOXpx^IfGMQj77+^RYO5Ii@RHF%qCk4S^5S2;=-EJ4-@fgVGfov9| z(MW14&;;5G*D!(#N`Fe|^?I1k=fK+=pcFBmPN%5X>*5J}^z$@O{_=~O}zDhY?b2wVmHc?4AuG}NoWNbq=s?jwQYI4}PIMGKP0 Ulh#EP01E&B07*qoM6N<$f(t?Z3jhEB diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_plate.png deleted file mode 100755 index 9f506593c1de4e003f8ee4c52e942a6980b90015..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 615 zcmV-t0+{`YP)N2bZe?^J zG%heMIczh2P5=M_;sqX${P zNH601h3^M=_XGSN?bwbSs>Yr@L`P@_0Oih(JQ)M}_(bu^nzL95lm-*#I#olZNY-%WKu z4g>7d{5V=|dwFc@Gs97^7HMCe8d5H1J7U=Y=672R$Z9$_4vDs{}+wFw6+bt~1 zk^w*OaS8bSew0cj%w{v}_j{a9Cjn!^at3U~4Y0d*pw7Yt3KR+jEEWqK4hI~MM=ij( z=G=~9{BZC*M6cJ2TrMYPR+|aN=kpn#)lWHsYAOQHiO=UlCX*2X)s;?E%o~bEe>tUJ z^?aG)K#9hP1D5Xa>4a_mBAKEMG*-{!rB4ZbqgMkM}DBh?}UilZa1+` zClsNRaQI6=JK*OTbU|>SUI%1?$0Jl71#H`X`3HF=mUa4sc1r*N002ovPDHLkV1meQ B15yA0 From a92e998efb95e421d95ba2c78d15f065f91cc96f Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 17:38:30 +0200 Subject: [PATCH 62/76] Another fix --- .../refinedstorage/models/item/wireless_grid_plate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json deleted file mode 100755 index 0bf6eaedc..000000000 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "refinedstorage:items/wireless_grid_plate" - } -} From 45f110acffb8b1997cb0aca60701137ff7699693 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 19:15:59 +0200 Subject: [PATCH 63/76] Fix crash with opening grids that are not connected (grid.getController() will be null and the synchronized stmt will fail) --- src/main/java/refinedstorage/gui/GuiGrid.java | 189 +++++++++--------- 1 file changed, 95 insertions(+), 94 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index fc5177797..27ece4711 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -112,90 +112,89 @@ public class GuiGrid extends GuiBase { public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); - synchronized (grid.getController()) { - drawString(7, 7, t("gui.refinedstorage:grid")); - if (grid.getType() == EnumGridType.CRAFTING) { - drawString(7, 94, t("container.crafting")); - } + drawString(7, 7, t("gui.refinedstorage:grid")); - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); + if (grid.getType() == EnumGridType.CRAFTING) { + drawString(7, 94, t("container.crafting")); + } - int x = 8; - int y = 20; + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 113, t("container.inventory")); - List items = getItems(); + int x = 8; + int y = 20; - hoveringSlotId = -1; + List items = getItems(); - int slot = getOffset() * 9; + hoveringSlotId = -1; - RenderHelper.enableGUIStandardItemLighting(); + int slot = getOffset() * 9; - for (int i = 0; i < 9 * getVisibleRows(); ++i) { - if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { - hoveringSlotId = slot; + RenderHelper.enableGUIStandardItemLighting(); - if (slot < items.size()) { - // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); - } - } + for (int i = 0; i < 9 * getVisibleRows(); ++i) { + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlotId = slot; if (slot < items.size()) { - int qty = items.get(slot).getQuantity(); - - String text; - - if (qty >= 1000000) { - text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; - } else if (qty >= 1000) { - text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; - } else if (qty == 1) { - text = null; - } else { - text = String.valueOf(qty); - } - - if (hoveringSlotId == slot && GuiScreen.isShiftKeyDown()) { - text = String.valueOf(qty); - } - - drawItem(x, y, items.get(slot).toItemStack(), true, text); - } - - if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { - int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; - - GlStateManager.disableLighting(); - GlStateManager.disableDepth(); - zLevel = 190; - GlStateManager.colorMask(true, true, true, false); - drawGradientRect(x, y, x + 16, y + 16, color, color); - zLevel = 0; - GlStateManager.colorMask(true, true, true, true); - GlStateManager.enableLighting(); - GlStateManager.enableDepth(); - } - - slot++; - - x += 18; - - if ((i + 1) % 9 == 0) { - x = 8; - y += 18; + // We need to use the ID, because if we filter, the client-side index will change + // while the serverside's index will still be the same. + hoveringId = items.get(slot).getId(); } } - if (isHoveringOverValidSlot(items)) { - drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); + if (slot < items.size()) { + int qty = items.get(slot).getQuantity(); + + String text; + + if (qty >= 1000000) { + text = String.format("%.1f", (float) qty / 1000000).replace(",", ".").replace(".0", "") + "M"; + } else if (qty >= 1000) { + text = String.format("%.1f", (float) qty / 1000).replace(",", ".").replace(".0", "") + "K"; + } else if (qty == 1) { + text = null; + } else { + text = String.valueOf(qty); + } + + if (hoveringSlotId == slot && GuiScreen.isShiftKeyDown() && qty > 1) { + text = String.valueOf(qty); + } + + drawItem(x, y, items.get(slot).toItemStack(), true, text); } - if (isHoveringOverClear(mouseX, mouseY)) { - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; + + GlStateManager.disableLighting(); + GlStateManager.disableDepth(); + zLevel = 190; + GlStateManager.colorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, color, color); + zLevel = 0; + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepth(); } + + slot++; + + x += 18; + + if ((i + 1) % 9 == 0) { + x = 8; + y += 18; + } + } + + if (isHoveringOverValidSlot(items)) { + drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); + } + + if (isHoveringOverClear(mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:clear")); } } @@ -206,53 +205,55 @@ public class GuiGrid extends GuiBase { return items; } - items.addAll(grid.getController().getItems()); + synchronized (grid.getController()) { + items.addAll(grid.getController().getItems()); - if (!searchField.getText().trim().isEmpty()) { - Iterator t = items.iterator(); + if (!searchField.getText().trim().isEmpty()) { + Iterator t = items.iterator(); - while (t.hasNext()) { - StorageItem item = t.next(); + while (t.hasNext()) { + StorageItem item = t.next(); - if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { - t.remove(); - } - } - } - - Collections.sort(items, new Comparator() { - @Override - public int compare(StorageItem o1, StorageItem o2) { - if (o1 != null && o2 != null) { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); - } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { + t.remove(); } } - - return 0; } - }); - if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { Collections.sort(items, new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { if (o1 != null && o2 != null) { if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); } } return 0; } }); - } - return items; + if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { + Collections.sort(items, new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (o1 != null && o2 != null) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + } + } + + return 0; + } + }); + } + + return items; + } } @Override From 861517cfde834a5f9b22d376c8e194af45567897 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 20:38:13 +0200 Subject: [PATCH 64/76] Remove getItems() in GuiGrid, should fix null ptrs and flickering --- src/main/java/refinedstorage/gui/GuiGrid.java | 120 ++++++++---------- 1 file changed, 56 insertions(+), 64 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 27ece4711..bd1163403 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -28,6 +28,8 @@ public class GuiGrid extends GuiBase { private ContainerGrid container; private TileGrid grid; + private List items = new ArrayList(); + private GuiTextField searchField; private int hoveringSlotId; @@ -60,6 +62,56 @@ public class GuiGrid extends GuiBase { @Override public void update(int x, int y) { + items.clear(); + + if (grid.isConnected()) { + items.addAll(grid.getController().getItems()); + + if (!searchField.getText().trim().isEmpty()) { + Iterator t = items.iterator(); + + while (t.hasNext()) { + StorageItem item = t.next(); + + if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { + t.remove(); + } + } + } + + Collections.sort(items, new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (o1 != null && o2 != null) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); + } + } + + return 0; + } + }); + + if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { + Collections.sort(items, new Comparator() { + @Override + public int compare(StorageItem o1, StorageItem o2) { + if (o1 != null && o2 != null) { + if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { + return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); + } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { + return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); + } + } + + return 0; + } + }); + } + } + scrollbar.setCanScroll(getRows() > getVisibleRows()); } @@ -72,12 +124,12 @@ public class GuiGrid extends GuiBase { return 0; } - int max = (int) Math.ceil((float) getItems().size() / (float) 9); + int max = (int) Math.ceil((float) items.size() / (float) 9); return max < 0 ? 0 : max; } - private boolean isHoveringOverValidSlot(List items) { + private boolean isHoveringOverValidSlot() { return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); } @@ -124,8 +176,6 @@ public class GuiGrid extends GuiBase { int x = 8; int y = 20; - List items = getItems(); - hoveringSlotId = -1; int slot = getOffset() * 9; @@ -189,7 +239,7 @@ public class GuiGrid extends GuiBase { } } - if (isHoveringOverValidSlot(items)) { + if (isHoveringOverValidSlot()) { drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); } @@ -198,64 +248,6 @@ public class GuiGrid extends GuiBase { } } - public List getItems() { - List items = new ArrayList(); - - if (!grid.isConnected()) { - return items; - } - - synchronized (grid.getController()) { - items.addAll(grid.getController().getItems()); - - if (!searchField.getText().trim().isEmpty()) { - Iterator t = items.iterator(); - - while (t.hasNext()) { - StorageItem item = t.next(); - - if (!item.toItemStack().getDisplayName().toLowerCase().contains(searchField.getText().toLowerCase())) { - t.remove(); - } - } - } - - Collections.sort(items, new Comparator() { - @Override - public int compare(StorageItem o1, StorageItem o2) { - if (o1 != null && o2 != null) { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); - } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); - } - } - - return 0; - } - }); - - if (grid.getSortingType() == TileGrid.SORTING_TYPE_QUANTITY) { - Collections.sort(items, new Comparator() { - @Override - public int compare(StorageItem o1, StorageItem o2) { - if (o1 != null && o2 != null) { - if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { - return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); - } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { - return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); - } - } - - return 0; - } - }); - } - - return items; - } - } - @Override public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException { super.mouseClicked(mouseX, mouseY, clickedButton); @@ -267,7 +259,7 @@ public class GuiGrid extends GuiBase { if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) { RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); - } else if (isHoveringOverValidSlot(getItems()) && container.getPlayer().inventory.getItemStack() == null) { + } else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null) { boolean half = clickedButton == 1; boolean shift = GuiScreen.isShiftKeyDown(); boolean one = clickedButton == 2; From d28aa15d1c7903b380ab7bcc83d2302433979fc1 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 20:50:36 +0200 Subject: [PATCH 65/76] Make some vars clear --- src/main/java/refinedstorage/gui/GuiGrid.java | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index bd1163403..00bedd564 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -32,8 +32,8 @@ public class GuiGrid extends GuiBase { private GuiTextField searchField; - private int hoveringSlotId; - private int hoveringId; + private int hoveringSlot; + private int hoveringItemId; private Scrollbar scrollbar; @@ -82,13 +82,11 @@ public class GuiGrid extends GuiBase { Collections.sort(items, new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { - if (o1 != null && o2 != null) { if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { return o2.toItemStack().getDisplayName().compareTo(o1.toItemStack().getDisplayName()); } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { return o1.toItemStack().getDisplayName().compareTo(o2.toItemStack().getDisplayName()); } - } return 0; } @@ -98,13 +96,11 @@ public class GuiGrid extends GuiBase { Collections.sort(items, new Comparator() { @Override public int compare(StorageItem o1, StorageItem o2) { - if (o1 != null && o2 != null) { if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_ASCENDING) { return Integer.valueOf(o2.getQuantity()).compareTo(o1.getQuantity()); } else if (grid.getSortingDirection() == TileGrid.SORTING_DIRECTION_DESCENDING) { return Integer.valueOf(o1.getQuantity()).compareTo(o2.getQuantity()); } - } return 0; } @@ -120,21 +116,17 @@ public class GuiGrid extends GuiBase { } public int getRows() { - if (!grid.isConnected()) { - return 0; - } - int max = (int) Math.ceil((float) items.size() / (float) 9); return max < 0 ? 0 : max; } - private boolean isHoveringOverValidSlot() { - return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); + private boolean isHoveringOverItemInSlot() { + return grid.isConnected() && isHoveringOverSlot() && hoveringSlot < items.size(); } private boolean isHoveringOverSlot() { - return hoveringSlotId >= 0; + return hoveringSlot >= 0; } public boolean isHoveringOverClear(int mouseX, int mouseY) { @@ -164,7 +156,6 @@ public class GuiGrid extends GuiBase { public void drawForeground(int mouseX, int mouseY) { scrollbar.update(this, mouseX, mouseY); - drawString(7, 7, t("gui.refinedstorage:grid")); if (grid.getType() == EnumGridType.CRAFTING) { @@ -176,7 +167,7 @@ public class GuiGrid extends GuiBase { int x = 8; int y = 20; - hoveringSlotId = -1; + hoveringSlot = -1; int slot = getOffset() * 9; @@ -184,12 +175,12 @@ public class GuiGrid extends GuiBase { for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { - hoveringSlotId = slot; + hoveringSlot = slot; if (slot < items.size()) { // We need to use the ID, because if we filter, the client-side index will change - // while the serverside's index will still be the same. - hoveringId = items.get(slot).getId(); + // while the server-side's index will still be the same. + hoveringItemId = items.get(slot).getId(); } } @@ -208,7 +199,7 @@ public class GuiGrid extends GuiBase { text = String.valueOf(qty); } - if (hoveringSlotId == slot && GuiScreen.isShiftKeyDown() && qty > 1) { + if (hoveringSlot == slot && GuiScreen.isShiftKeyDown() && qty > 1) { text = String.valueOf(qty); } @@ -239,8 +230,8 @@ public class GuiGrid extends GuiBase { } } - if (isHoveringOverValidSlot()) { - drawTooltip(mouseX, mouseY, items.get(hoveringSlotId).toItemStack()); + if (isHoveringOverItemInSlot()) { + drawTooltip(mouseX, mouseY, items.get(hoveringSlot).toItemStack()); } if (isHoveringOverClear(mouseX, mouseY)) { @@ -259,12 +250,12 @@ public class GuiGrid extends GuiBase { if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) { RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); - } else if (isHoveringOverValidSlot() && container.getPlayer().inventory.getItemStack() == null) { + } else if (isHoveringOverItemInSlot() && container.getPlayer().inventory.getItemStack() == null) { boolean half = clickedButton == 1; boolean shift = GuiScreen.isShiftKeyDown(); boolean one = clickedButton == 2; - RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringId, half, one, shift)); + RefinedStorage.NETWORK.sendToServer(new MessageStoragePull(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), hoveringItemId, half, one, shift)); } else if (clickedClear) { RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingClear(grid)); } else { @@ -275,6 +266,7 @@ public class GuiGrid extends GuiBase { } } } + if (grid.getType() == EnumGridType.CRAFTING) { for (Slot slot : container.getCraftingSlots()) { if (inBounds(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX - guiLeft, mouseY - guiTop)) { @@ -301,10 +293,6 @@ public class GuiGrid extends GuiBase { } public int getVisibleRows() { - if (grid.getType() == EnumGridType.CRAFTING) { - return 4; - } - - return 5; + return grid.getType() == EnumGridType.CRAFTING ? 4 : 5; } } From 1991c64da352cc49db0a478fc9dd4c47bfa77708 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 23:17:27 +0200 Subject: [PATCH 66/76] Remove usage of that packet --- .../container/ContainerGrid.java | 24 ++++++- .../slot/SlotGridCraftingResult.java | 7 +- .../network/MessageGridCraftingUpdate.java | 72 ------------------- .../refinedstorage/proxy/CommonProxy.java | 1 - .../refinedstorage/tile/TileController.java | 1 - .../java/refinedstorage/tile/TileGrid.java | 9 +-- 6 files changed, 30 insertions(+), 84 deletions(-) delete mode 100755 src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index fff95f757..4bc86fc1e 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -1,7 +1,9 @@ package refinedstorage.container; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import refinedstorage.block.EnumGridType; import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.tile.TileGrid; @@ -36,11 +38,31 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(new SlotGridCraftingResult(player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); + addSlotToContainer(new SlotGridCraftingResult(this, player, grid.getCraftingInventory(), grid.getCraftingResultInventory(), grid, 0, 133 + 4, 120 + 4)); } } public List getCraftingSlots() { return craftingSlots; } + + // I'm overriding detectAndSendChanges() here because the default check + // checks if the item stacks are equal, and if so, then it will only send the new slot contents. + // The thing is though, when the grid replaces the slots with new items from the storage + // system, the item stack replaced WILL be the same! + // That's why we override this here to get rid of the check and ALWAYS send slot changes. + @Override + public void detectAndSendChanges() { + for (int i = 0; i < this.inventorySlots.size(); ++i) { + ItemStack itemstack = ((Slot) this.inventorySlots.get(i)).getStack(); + ItemStack itemstack1 = (ItemStack) this.inventoryItemStacks.get(i); + + itemstack1 = itemstack == null ? null : itemstack.copy(); + this.inventoryItemStacks.set(i, itemstack1); + + for (int j = 0; j < this.crafters.size(); ++j) { + ((ICrafting) this.crafters.get(j)).sendSlotContents(this, i, itemstack1); + } + } + } } diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index e0db40e0d..79f771526 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -5,15 +5,18 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; +import refinedstorage.container.ContainerGrid; import refinedstorage.tile.TileGrid; public class SlotGridCraftingResult extends SlotCrafting { + private ContainerGrid container; private IInventory craftingMatrix; private TileGrid grid; - public SlotGridCraftingResult(EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) { + public SlotGridCraftingResult(ContainerGrid container, EntityPlayer player, InventoryCrafting craftingMatrix, IInventory craftingResult, TileGrid grid, int id, int x, int y) { super(player, craftingMatrix, craftingResult, id, x, y); + this.container = container; this.craftingMatrix = craftingMatrix; this.grid = grid; } @@ -30,6 +33,6 @@ public class SlotGridCraftingResult extends SlotCrafting { super.onPickupFromSlot(player, stack); - grid.onCrafted(matrixSlots); + grid.onCrafted(container, matrixSlots); } } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java b/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java deleted file mode 100755 index 37fb7c0df..000000000 --- a/src/main/java/refinedstorage/network/MessageGridCraftingUpdate.java +++ /dev/null @@ -1,72 +0,0 @@ -package refinedstorage.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -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.tile.TileGrid; - -public class MessageGridCraftingUpdate implements IMessage, IMessageHandler { - private int x; - private int y; - private int z; - private ItemStack[] craftingMatrix = new ItemStack[9]; - - public MessageGridCraftingUpdate() { - } - - public MessageGridCraftingUpdate(TileGrid grid) { - this.x = grid.getPos().getX(); - this.y = grid.getPos().getY(); - this.z = grid.getPos().getZ(); - - for (int i = 0; i < 9; ++i) { - craftingMatrix[i] = grid.getCraftingInventory().getStackInSlot(i); - } - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - - for (int i = 0; i < 9; ++i) { - craftingMatrix[i] = ByteBufUtils.readItemStack(buf); - } - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - - for (ItemStack stack : craftingMatrix) { - ByteBufUtils.writeItemStack(buf, stack); - } - } - - @Override - public IMessage onMessage(final MessageGridCraftingUpdate message, MessageContext context) { - Minecraft.getMinecraft().addScheduledTask(new Runnable() { - @Override - public void run() { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(new BlockPos(message.x, message.y, message.z)); - - if (tile instanceof TileGrid) { - for (int i = 0; i < 9; ++i) { - ((TileGrid) tile).getCraftingInventory().setInventorySlotContents(i, message.craftingMatrix[i]); - } - } - } - }); - - return null; - } -} diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 88385fbb3..bf3a3bc8c 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -34,7 +34,6 @@ public class CommonProxy { RefinedStorage.NETWORK.registerMessage(MessageModeToggle.class, MessageModeToggle.class, 5, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageDetectorModeUpdate.class, MessageDetectorModeUpdate.class, 6, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageDetectorAmountUpdate.class, MessageDetectorAmountUpdate.class, 7, Side.SERVER); - RefinedStorage.NETWORK.registerMessage(MessageGridCraftingUpdate.class, MessageGridCraftingUpdate.class, 8, Side.CLIENT); RefinedStorage.NETWORK.registerMessage(MessageGridCraftingClear.class, MessageGridCraftingClear.class, 9, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 94d06d9d3..93477b8f1 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -359,7 +359,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor machines.add((TileMachine) tile); } } - } @Override diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index 10d83b11a..100a2adae 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -8,13 +8,10 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; -import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.BlockGrid; import refinedstorage.block.EnumGridType; import refinedstorage.inventory.InventorySimple; -import refinedstorage.network.MessageGridCraftingUpdate; import refinedstorage.storage.StorageItem; import refinedstorage.util.InventoryUtils; @@ -76,7 +73,7 @@ public class TileGrid extends TileMachine { craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); } - public void onCrafted(ItemStack[] matrixSlots) { + public void onCrafted(Container container, ItemStack[] matrixSlots) { if (isConnected() && !worldObj.isRemote) { for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { ItemStack slot = craftingInventory.getStackInSlot(i); @@ -94,9 +91,7 @@ public class TileGrid extends TileMachine { onCraftingMatrixChanged(); - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - - RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); + container.detectAndSendChanges(); } } From 2c32b31385a9886e0f5e1c8c9151aa91d852d6ac Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 23:29:55 +0200 Subject: [PATCH 67/76] Make crafting INSTANT! --- .../container/slot/SlotGridCraftingResult.java | 12 +----------- src/main/java/refinedstorage/tile/TileGrid.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index 79f771526..d369cc3c0 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -23,16 +23,6 @@ public class SlotGridCraftingResult extends SlotCrafting { @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - ItemStack[] matrixSlots = new ItemStack[craftingMatrix.getSizeInventory()]; - - for (int i = 0; i < craftingMatrix.getSizeInventory(); ++i) { - if (craftingMatrix.getStackInSlot(i) != null) { - matrixSlots[i] = craftingMatrix.getStackInSlot(i).copy(); - } - } - - super.onPickupFromSlot(player, stack); - - grid.onCrafted(container, matrixSlots); + grid.onCrafted(container); } } diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index 100a2adae..fe3c87443 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -11,8 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.BlockGrid; import refinedstorage.block.EnumGridType; +import refinedstorage.container.ContainerGrid; import refinedstorage.inventory.InventorySimple; -import refinedstorage.storage.StorageItem; import refinedstorage.util.InventoryUtils; public class TileGrid extends TileMachine { @@ -73,18 +73,16 @@ public class TileGrid extends TileMachine { craftingResultInventory.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(craftingInventory, worldObj)); } - public void onCrafted(Container container, ItemStack[] matrixSlots) { + public void onCrafted(ContainerGrid container) { if (isConnected() && !worldObj.isRemote) { for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { ItemStack slot = craftingInventory.getStackInSlot(i); - if (slot == null && matrixSlots[i] != null) { - for (StorageItem item : getController().getItems()) { - if (item.compareNoQuantity(matrixSlots[i].copy())) { - craftingInventory.setInventorySlotContents(i, getController().take(matrixSlots[i].copy())); - - break; - } + if (slot != null) { + if (slot.stackSize == 1) { + craftingInventory.setInventorySlotContents(i, getController().take(slot.copy())); + } else { + craftingInventory.decrStackSize(i, 1); } } } From 0e868cbed31a1b8306b4ce018448f8586bb3256c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 23:35:23 +0200 Subject: [PATCH 68/76] Fire crafting events and stuff --- .../container/slot/SlotGridCraftingResult.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index d369cc3c0..350905dd0 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -5,6 +5,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.FMLCommonHandler; import refinedstorage.container.ContainerGrid; import refinedstorage.tile.TileGrid; @@ -23,6 +24,10 @@ public class SlotGridCraftingResult extends SlotCrafting { @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + FMLCommonHandler.instance().firePlayerCraftingEvent(player, stack, craftingMatrix); + + onCrafting(stack); + grid.onCrafted(container); } } From ae585d7e021c13a8b04e440410efeed76bb3a82b Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 28 Mar 2016 23:42:17 +0200 Subject: [PATCH 69/76] Fix dupe glitch --- src/main/java/refinedstorage/tile/TileGrid.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index fe3c87443..26bff673a 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -74,12 +74,12 @@ public class TileGrid extends TileMachine { } public void onCrafted(ContainerGrid container) { - if (isConnected() && !worldObj.isRemote) { + if (!worldObj.isRemote) { for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { ItemStack slot = craftingInventory.getStackInSlot(i); if (slot != null) { - if (slot.stackSize == 1) { + if (slot.stackSize == 1 && isConnected()) { craftingInventory.setInventorySlotContents(i, getController().take(slot.copy())); } else { craftingInventory.decrStackSize(i, 1); From 2ed22acb671d1e02c861d4e286f1dc2729635c9a Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 00:51:08 +0200 Subject: [PATCH 70/76] Remove unneeded explanation, change behaviour of quantity slots a bit --- .../container/ContainerBase.java | 46 +++++++++--------- .../container/ContainerGrid.java | 4 +- src/main/java/refinedstorage/gui/GuiGrid.java | 2 +- .../java/refinedstorage/gui/GuiInterface.java | 8 --- .../assets/refinedstorage/lang/en_US.lang | 3 -- .../assets/refinedstorage/lang/nl_NL.lang | 3 -- .../refinedstorage/textures/gui/interface.png | Bin 1921 -> 1891 bytes 7 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java index 77224ef32..2a876fd14 100755 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -57,7 +57,29 @@ public abstract class ContainerBase extends Container { if (slot instanceof SlotSpecimen) { if (((SlotSpecimen) slot).isSizeAllowed()) { - if (player.inventory.getItemStack() != null) { + if (slot.getStack() != null) { + if (GuiScreen.isShiftKeyDown()) { + slot.putStack(null); + } else { + int amount = slot.getStack().stackSize; + + if (clickedButton == 0) { + amount--; + + if (amount < 1) { + amount = 1; + } + } else if (clickedButton == 1) { + amount++; + + if (amount > 64) { + amount = 64; + } + } + + slot.getStack().stackSize = amount; + } + } else if (player.inventory.getItemStack() != null) { int amount = player.inventory.getItemStack().stackSize; if (clickedButton == 1) { @@ -68,28 +90,6 @@ public abstract class ContainerBase extends Container { toPut.stackSize = amount; slot.putStack(toPut); - } else if (slot.getStack() != null) { - if (GuiScreen.isShiftKeyDown()) { - slot.putStack(null); - } else { - int amount = slot.getStack().stackSize; - - if (clickedButton == 0) { - amount++; - - if (amount > 64) { - amount = 64; - } - } else if (clickedButton == 1) { - amount--; - - if (amount < 1) { - amount = 1; - } - } - - slot.getStack().stackSize = amount; - } } } else if (player.inventory.getItemStack() == null) { slot.putStack(null); diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 4bc86fc1e..0234cab7b 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -49,8 +49,8 @@ public class ContainerGrid extends ContainerBase { // I'm overriding detectAndSendChanges() here because the default check // checks if the item stacks are equal, and if so, then it will only send the new slot contents. // The thing is though, when the grid replaces the slots with new items from the storage - // system, the item stack replaced WILL be the same! - // That's why we override this here to get rid of the check and ALWAYS send slot changes. + // system, the item stack replaced WILL be the same and thus changes will not be sent! + // That is why we override here to get rid of the check and ALWAYS send slot changes. @Override public void detectAndSendChanges() { for (int i = 0; i < this.inventorySlots.size(); ++i) { diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 00bedd564..17ae74a6d 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -248,7 +248,7 @@ public class GuiGrid extends GuiBase { if (grid.isConnected()) { TileController controller = grid.getController(); - if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null) { + if (isHoveringOverSlot() && container.getPlayer().inventory.getItemStack() != null && (clickedButton == 0 || clickedButton == 1)) { RefinedStorage.NETWORK.sendToServer(new MessageStoragePush(controller.getPos().getX(), controller.getPos().getY(), controller.getPos().getZ(), -1, clickedButton == 1)); } else if (isHoveringOverItemInSlot() && container.getPlayer().inventory.getItemStack() == null) { boolean half = clickedButton == 1; diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java index 2a402f3a6..6242b976d 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -39,13 +39,5 @@ public class GuiInterface extends GuiBase { drawString(7, 7, t("gui.refinedstorage:interface.import")); drawString(7, 42, t("gui.refinedstorage:interface.export")); drawString(7, 123, t("container.inventory")); - - if (inBounds(162, 42, 7, 7, mouseX, mouseY)) { - String message = t("gui.refinedstorage:interface.export.explanation.0"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.1"); - message += "\n" + t("gui.refinedstorage:interface.export.explanation.2"); - - drawTooltip(mouseX, mouseY, message); - } } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 368495c67..b50764d79 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -17,9 +17,6 @@ gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relay gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export -gui.refinedstorage:interface.export.explanation.0=Top slots: items you want exported -gui.refinedstorage:interface.export.explanation.1=Clear a slot: mouse click + SHIFT -gui.refinedstorage:interface.export.explanation.2=Incr. or decr. a slot: left/ right mouse click misc.refinedstorage:energy_stored=%d / %d RF misc.refinedstorage:energy_usage=Usage: %d RF/t diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index e2135d7c1..b57f86d95 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -17,9 +17,6 @@ gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relais gui.refinedstorage:interface.import=Interface Import gui.refinedstorage:interface.export=Interface Export -gui.refinedstorage:interface.export.explanation.0=Bovenste slots: items die je wilt exporten -gui.refinedstorage:interface.export.explanation.1=Slot leegmaken: muisklik + SHIFT -gui.refinedstorage:interface.export.explanation.2=Verhoog of verklein aantal: links/ rechts muisklik misc.refinedstorage:energy_stored=%d / %d RF misc.refinedstorage:energy_usage=Vebruik: %d RF/t diff --git a/src/main/resources/assets/refinedstorage/textures/gui/interface.png b/src/main/resources/assets/refinedstorage/textures/gui/interface.png index 052e3350b274bc6d1c1ff6d1f57c286a79fe9f69..04066740e541448a5fdc2027b29d801d504378d1 100755 GIT binary patch delta 682 zcmZqVf6TWbgoW!M0|Vbd#vK#0-%gHWQLjJg>Eakt5%>1i#jM*70&Rg;JMaIWc-P|J zYtx-VX>DmYJ_kx{7EdY-$hq-q$K5{5yRWSCj+grJG96#?dw<rE5-l>D7<})|NgvDF8(?{d>5l#UCG~EZIBWmXn0e7BNFf3^mEk`tB;l28ig+p+r?P)>C2jr1+VvtLJfgg58^u9 zpDi1zeU`zPi6MdK!1e24cA;z_D-|KmNC$DT9-t!K`7= z9PMW>hf8k&YDm=9mZt1@O@hORWIWMJwUk$wb~Ggoxd8u zTmka^GyFO*gJV0oA~7aY@Aiq%rQ|6eZNbOhwy*+s(*dng^P>@^<2xo+$c%qojymj z;Y=>`gq^tzM%#HEo^4}1amS2d=502G;@b=h;e(T^vIy;@;l6*!9RkpzY$B7kmCI?{@od zXcVp#y2f>Wf9s@u9CMw+rr*n%e%frgckS)e-!p@o5176DSAXs+lX=7EDf{-HW-V)o zsdZprU^ubwG!u|Q;T_<8@H&6_nZ^J2T;eVGb@}}AwLleMu<3pBCK#K+?|ZnxykA?U zrZq@1GB7Co*5f|#ocT^Y%dY;T_B;Nne=PZR%YGeK!Qb=?j~M1PTxGmg$Mi{l>F?vF zjPrn2I(&=0rhnjX_p_Co%&m?3@5Q`i+wu2?-PMX6Und)|iPgWd?b`=2+JNoBudP%4 zr$Q|O*egkF{toZ{#9ix>`V_A4ec$w{tCrQUKY90hKijby zPP4oJWg2!n*om95Cy1X|eu|B8j`h2G5eIJuhAoUw=Dt~c?E60B{lw?*#R?fsYUW0s2(jUuAjLQb~p9dhWgH)-&Dp*Oo9p@vOe`!(jh* zP|Sb;G?KvV7uF|NBDtWBvFKaXm5P0{E5BUwGIyxUm79E&O{FrMxn?^<&hOIWA^Zh@ zCujR-yk@vDze)41d2Hli)pS;c;+qU9deRMNQkf_0%waH^&g<}O6XS^(GlrR`*@%$5 d{fJ@uX?wSahhIkceB1_dm#3?r%Q~loCIAqXBV_;p From b63758ad782000aff33d119dd5a218eebbd01606 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 01:39:18 +0200 Subject: [PATCH 71/76] Fix getting a stack of unstackable stuff from grid + text rendering order --- src/main/java/refinedstorage/gui/GuiBase.java | 4 ++-- src/main/java/refinedstorage/network/MessageStoragePull.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 239ee6099..98adc423c 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -159,6 +159,8 @@ public abstract class GuiBase extends GuiContainer { } public void drawItemOverlay(ItemStack stack, String text, int x, int y) { + itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); + if (text != null) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, 1); @@ -182,8 +184,6 @@ public abstract class GuiBase extends GuiContainer { GlStateManager.disableBlend(); GlStateManager.popMatrix(); } - - itemRender.renderItemOverlayIntoGUI(fontRendererObj, stack, x, y, ""); } public void drawString(int x, int y, String message) { diff --git a/src/main/java/refinedstorage/network/MessageStoragePull.java b/src/main/java/refinedstorage/network/MessageStoragePull.java index 23a089b79..9ed5b2f11 100755 --- a/src/main/java/refinedstorage/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -73,7 +73,9 @@ public class MessageStoragePull extends MessageHandlerPlayerToServer item.getType().getItemStackLimit(item.toItemStack())) { + } + + if (quantity > item.getType().getItemStackLimit(item.toItemStack())) { quantity = item.getType().getItemStackLimit(item.toItemStack()); } From c74e4dc6288eb84ee9782a8e411e3ccd7ae01184 Mon Sep 17 00:00:00 2001 From: Raoul Date: Tue, 29 Mar 2016 02:51:21 +0200 Subject: [PATCH 72/76] Update changelog to reflect changes made today --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba1a824cb..f91afd04d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,14 @@ ### 0.5 **Bugfixes** - Fixed clicking sound in Grid -- Fixed NPE in Grid while sorting +- Fixed a bunch of crashes - Fixed exporter not exporting is some cases - Fixed importer not importing in some cases - Fixed controller drawing RF every 20 ticks instead of every tick - Fixed not being able to shift click from Crafting Grid crafting slots -- Fixed crash with interfaces +- Fixed new items inserted after crafting in Grid being laggy +- Fixed flickering of items in Grid +- Fixed getting a stack of unstackable stuff from Grid - Check if the Constructor can actually place said block in the world **Features** @@ -25,7 +27,7 @@ - Deep Storage Unit integration (with this several barrel mods are now supported too!) - Machines don't need to be connected with cables anymore, they can be next to each other too - Made the amount text in the Grid for items smaller -- Nice formatting for items >= 1K +- Nice formatting for items >= 1K (pressing shift while hovering over an item will still display the real item count) - When placing Importer, Exporter or External Storage with SHIFT, it will have the opposite direction. This is for easy placement behind other blocks (furnaces for example) ### 0.4.1 @@ -45,4 +47,4 @@ - Interfaces ### 0.3 -- Initial release \ No newline at end of file +- Initial release From 881bd30bf88eedc451a75e5c3860a5638b2921d0 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 12:28:28 +0200 Subject: [PATCH 73/76] Remove redstoneControlled uglyness --- src/main/java/refinedstorage/tile/TileController.java | 6 +----- src/main/java/refinedstorage/tile/TileDetector.java | 10 ++++++---- src/main/java/refinedstorage/tile/TileMachine.java | 7 ++----- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 93477b8f1..a0e081fe1 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -42,11 +42,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor public void update() { super.update(); - if (destroyed) { - return; - } - - if (!worldObj.isRemote) { + if (!worldObj.isRemote && !destroyed) { int lastEnergy = energy.getEnergyStored(); if (ticks % 20 == 0) { diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index cb725c1b2..c94869f2a 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -8,6 +8,7 @@ import refinedstorage.RefinedStorageBlocks; import refinedstorage.inventory.InventorySimple; import refinedstorage.storage.StorageItem; import refinedstorage.tile.settings.ICompareSetting; +import refinedstorage.tile.settings.RedstoneMode; import refinedstorage.util.InventoryUtils; public class TileDetector extends TileMachine implements ICompareSetting { @@ -27,10 +28,6 @@ public class TileDetector extends TileMachine implements ICompareSetting { private boolean powered = false; - public TileDetector() { - this.redstoneControlled = false; - } - @Override public void onDisconnected() { super.onDisconnected(); @@ -188,4 +185,9 @@ public class TileDetector extends TileMachine implements ICompareSetting { public IInventory getInventory() { return inventory; } + + @Override + public void setRedstoneMode(RedstoneMode mode) { + // NO OP + } } diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index c7d6f4c55..3e774cb91 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -10,7 +10,6 @@ import refinedstorage.tile.settings.RedstoneMode; public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { protected boolean connected = false; - protected boolean redstoneControlled = true; protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; @@ -69,11 +68,9 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed @Override public void setRedstoneMode(RedstoneMode mode) { - if (redstoneControlled) { - markDirty(); + markDirty(); - this.redstoneMode = mode; - } + this.redstoneMode = mode; } @Override From df5eb27ee952401dab524f5cbf60876023eb1d43 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 12:44:41 +0200 Subject: [PATCH 74/76] Shift clicking in grid crafting --- .../container/ContainerBase.java | 5 +++ .../slot/SlotGridCraftingResult.java | 4 +++ .../java/refinedstorage/tile/TileGrid.java | 31 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/src/main/java/refinedstorage/container/ContainerBase.java b/src/main/java/refinedstorage/container/ContainerBase.java index 2a876fd14..aa0685fbe 100755 --- a/src/main/java/refinedstorage/container/ContainerBase.java +++ b/src/main/java/refinedstorage/container/ContainerBase.java @@ -7,6 +7,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import refinedstorage.container.slot.SlotDisabled; +import refinedstorage.container.slot.SlotGridCraftingResult; import refinedstorage.container.slot.SlotSpecimen; import java.util.ArrayList; @@ -98,6 +99,10 @@ public abstract class ContainerBase extends Container { } return player.inventory.getItemStack(); + } else if (slot instanceof SlotGridCraftingResult && slot.getHasStack() && GuiScreen.isShiftKeyDown()) { + ((SlotGridCraftingResult) slot).onShiftClick(player); + + return null; } else if (slot instanceof SlotDisabled) { return null; } diff --git a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java index 350905dd0..3bf56c7b5 100755 --- a/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java +++ b/src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java @@ -30,4 +30,8 @@ public class SlotGridCraftingResult extends SlotCrafting { grid.onCrafted(container); } + + public void onShiftClick(EntityPlayer player) { + grid.onCraftedShift(container, player); + } } diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index 26bff673a..a1a776e46 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -15,6 +15,9 @@ import refinedstorage.container.ContainerGrid; import refinedstorage.inventory.InventorySimple; import refinedstorage.util.InventoryUtils; +import java.util.ArrayList; +import java.util.List; + public class TileGrid extends TileMachine { public static final String NBT_SORTING_DIRECTION = "SortingDirection"; public static final String NBT_SORTING_TYPE = "SortingType"; @@ -93,6 +96,34 @@ public class TileGrid extends TileMachine { } } + public void onCraftedShift(ContainerGrid container, EntityPlayer player) { + List craftedItemsList = new ArrayList(); + int craftedItems = 0; + ItemStack crafted = craftingResultInventory.getStackInSlot(0); + + while (true) { + onCrafted(container); + + craftedItemsList.add(crafted.copy()); + + craftedItems += crafted.stackSize; + + if (!InventoryUtils.compareStack(crafted, craftingResultInventory.getStackInSlot(0)) || craftedItems + crafted.stackSize > 64) { + break; + } + } + + for (ItemStack craftedItem : craftedItemsList) { + if (!player.inventory.addItemStackToInventory(craftedItem.copy())) { + if (isConnected() && getController().push(craftedItem.copy())) { + // NO OP + } else { + InventoryUtils.dropStack(player.worldObj, craftedItem, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ()); + } + } + } + } + public int getSortingDirection() { return sortingDirection; } From ccf916d17d0008c5e9762f7b4ddf1b5b3f85be68 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 13:02:22 +0200 Subject: [PATCH 75/76] Start working on recipe transfer handlers in grid.. --- .../jei/GridRecipeTransferHandler.java | 65 +++++++++++++++++++ .../jei/PluginRefinedStorage.java | 3 +- .../network/MessageGridCraftingTransfer.java | 33 ++++++++++ .../refinedstorage/proxy/CommonProxy.java | 1 + .../refinedstorage/util/InventoryUtils.java | 1 - 5 files changed, 101 insertions(+), 2 deletions(-) create mode 100755 src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java create mode 100755 src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java diff --git a/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java new file mode 100755 index 000000000..51ba42c3b --- /dev/null +++ b/src/main/java/refinedstorage/jei/GridRecipeTransferHandler.java @@ -0,0 +1,65 @@ +package refinedstorage.jei; + +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.transfer.IRecipeTransferError; +import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; +import mezz.jei.gui.ingredients.IGuiIngredient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import refinedstorage.RefinedStorage; +import refinedstorage.container.ContainerGrid; +import refinedstorage.network.MessageGridCraftingTransfer; + +import java.util.List; +import java.util.Map; + +// Thanks to https://github.com/zerofall/EZStorage/blob/master/src/main/java/com/zerofall/ezstorage/jei/RecipeTransferHandler.java +public class GridRecipeTransferHandler implements IRecipeTransferHandler { + @Override + public Class getContainerClass() { + return ContainerGrid.class; + } + + @Override + public String getRecipeCategoryUid() { + return "minecraft.crafting"; + } + + @Override + public IRecipeTransferError transferRecipe(Container container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer) { + if (doTransfer) { + Map> inputs = recipeLayout.getItemStacks().getGuiIngredients(); + + NBTTagCompound recipe = new NBTTagCompound(); + + for (Slot slot : container.inventorySlots) { + if (slot.inventory instanceof InventoryCrafting) { + IGuiIngredient ingredient = inputs.get(slot.getSlotIndex() + 1); + + if (ingredient != null) { + List possibleItems = ingredient.getAllIngredients(); + + NBTTagList tags = new NBTTagList(); + + for (ItemStack stack : possibleItems) { + NBTTagCompound tag = new NBTTagCompound(); + stack.writeToNBT(tag); + tags.appendTag(tag); + } + + recipe.setTag("#" + slot.getSlotIndex(), tags); + } + } + } + + RefinedStorage.NETWORK.sendToServer(new MessageGridCraftingTransfer(recipe)); + } + + return null; + } +} diff --git a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java index 238d00bbd..216a3b9ff 100755 --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -13,7 +13,8 @@ import refinedstorage.tile.TileStorage; public class PluginRefinedStorage extends BlankModPlugin { @Override public void register(IModRegistry registry) { - // @TODO: JEI transfer handler + registry.getRecipeTransferRegistry().addRecipeTransferHandler(new GridRecipeTransferHandler()); + registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper())); registry.addRecipeHandlers(new SoldererRecipeHandler()); diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java new file mode 100755 index 000000000..2e42339f4 --- /dev/null +++ b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java @@ -0,0 +1,33 @@ +package refinedstorage.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; + +public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer implements IMessage { + private NBTTagCompound recipe; + + public MessageGridCraftingTransfer() { + } + + public MessageGridCraftingTransfer(NBTTagCompound recipe) { + this.recipe = recipe; + } + + @Override + public void fromBytes(ByteBuf buf) { + recipe = ByteBufUtils.readTag(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeTag(buf, recipe); + } + + @Override + public void handle(MessageGridCraftingTransfer message, EntityPlayerMP player) { + // @TODO: Make it do something + } +} diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index bf3a3bc8c..45d217346 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -38,6 +38,7 @@ public class CommonProxy { RefinedStorage.NETWORK.registerMessage(MessagePriorityUpdate.class, MessagePriorityUpdate.class, 10, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageGridSortingUpdate.class, MessageGridSortingUpdate.class, 11, Side.SERVER); RefinedStorage.NETWORK.registerMessage(MessageGridCraftingPush.class, MessageGridCraftingPush.class, 12, Side.SERVER); + RefinedStorage.NETWORK.registerMessage(MessageGridCraftingTransfer.class, MessageGridCraftingTransfer.class, 13, Side.SERVER); NetworkRegistry.INSTANCE.registerGuiHandler(RefinedStorage.INSTANCE, new GuiHandler()); diff --git a/src/main/java/refinedstorage/util/InventoryUtils.java b/src/main/java/refinedstorage/util/InventoryUtils.java index 4008b3b9d..1e62fa23f 100755 --- a/src/main/java/refinedstorage/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/util/InventoryUtils.java @@ -144,7 +144,6 @@ public class InventoryUtils { int toGo = stack.stackSize; for (int i = 0; i < inventory.getSizeInventory(); ++i) { - // @TODO: Test this better if (!inventory.isItemValidForSlot(i, stack)) { continue; } From 094343f875e88acc7df72d7c9912e0ab73e74fca Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 29 Mar 2016 14:26:52 +0200 Subject: [PATCH 76/76] Recipe transfer --- .../container/ContainerGrid.java | 8 +++++ .../network/MessageGridCraftingTransfer.java | 28 +++++++++++++++- .../java/refinedstorage/tile/TileGrid.java | 32 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index 0234cab7b..09ea57ede 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -14,9 +14,13 @@ import java.util.List; public class ContainerGrid extends ContainerBase { private List craftingSlots = new ArrayList(); + private TileGrid grid; + public ContainerGrid(EntityPlayer player, TileGrid grid) { super(player); + this.grid = grid; + addPlayerInventory(8, grid.getType() == EnumGridType.CRAFTING ? 174 : 126); if (grid.getType() == EnumGridType.CRAFTING) { @@ -42,6 +46,10 @@ public class ContainerGrid extends ContainerBase { } } + public TileGrid getGrid() { + return grid; + } + public List getCraftingSlots() { return craftingSlots; } diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java index 2e42339f4..135d09a6e 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingTransfer.java @@ -2,9 +2,15 @@ package refinedstorage.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +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.TileGrid; public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer implements IMessage { private NBTTagCompound recipe; @@ -28,6 +34,26 @@ public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer 0) { + actualRecipe[x] = new ItemStack[list.tagCount()]; + + for (int y = 0; y < list.tagCount(); y++) { + actualRecipe[x][y] = ItemStack.loadItemStackFromNBT(list.getCompoundTagAt(y)); + } + } + } + + grid.onRecipeTransfer(actualRecipe); + } + } } } diff --git a/src/main/java/refinedstorage/tile/TileGrid.java b/src/main/java/refinedstorage/tile/TileGrid.java index a1a776e46..86fc515ef 100755 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -124,6 +124,38 @@ public class TileGrid extends TileMachine { } } + public void onRecipeTransfer(ItemStack[][] recipe) { + if (isConnected()) { + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + ItemStack slot = craftingInventory.getStackInSlot(i); + + if (slot != null) { + if (!getController().push(slot)) { + return; + } + + craftingInventory.setInventorySlotContents(i, null); + } + } + + for (int i = 0; i < craftingInventory.getSizeInventory(); ++i) { + if (recipe[i] != null) { + ItemStack[] possibilities = recipe[i]; + + for (ItemStack possibility : possibilities) { + ItemStack took = getController().take(possibility); + + if (took != null) { + craftingInventory.setInventorySlotContents(i, possibility); + + break; + } + } + } + } + } + } + public int getSortingDirection() { return sortingDirection; }