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] 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 | 83 +- .../refinedstorage/RefinedStorageBlocks.java | 35 +- .../refinedstorage/RefinedStorageGui.java | 29 +- .../refinedstorage/RefinedStorageItems.java | 19 +- .../java/refinedstorage/block/BlockBase.java | 210 +++-- .../java/refinedstorage/block/BlockCable.java | 126 ++- .../block/BlockConstructor.java | 35 +- .../refinedstorage/block/BlockController.java | 170 ++-- .../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 | 203 +++-- .../block/BlockWirelessTransmitter.java | 79 +- .../block/EnumControllerType.java | 45 +- .../refinedstorage/block/EnumGridType.java | 55 +- .../refinedstorage/block/EnumStorageType.java | 97 +-- .../container/ContainerBase.java | 248 +++--- .../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 | 104 +-- .../container/ContainerRelay.java | 12 +- .../container/ContainerSolderer.java | 78 +- .../container/ContainerStorage.java | 19 +- .../ContainerWirelessTransmitter.java | 85 +- .../container/slot/BasicItemValidator.java | 21 +- .../container/slot/IItemValidator.java | 5 +- .../container/slot/SlotDisabled.java | 19 +- .../container/slot/SlotFiltered.java | 23 +- .../slot/SlotGridCraftingResult.java | 55 +- .../container/slot/SlotOutput.java | 19 +- .../container/slot/SlotSpecimen.java | 69 +- src/main/java/refinedstorage/gui/GuiBase.java | 410 +++++---- .../refinedstorage/gui/GuiConstructor.java | 72 +- .../refinedstorage/gui/GuiController.java | 197 ++--- .../refinedstorage/gui/GuiDestructor.java | 66 +- .../java/refinedstorage/gui/GuiDetector.java | 130 ++- .../java/refinedstorage/gui/GuiExporter.java | 72 +- src/main/java/refinedstorage/gui/GuiGrid.java | 596 ++++++------- .../java/refinedstorage/gui/GuiHandler.java | 148 ++-- .../java/refinedstorage/gui/GuiImporter.java | 76 +- .../java/refinedstorage/gui/GuiInterface.java | 91 +- .../java/refinedstorage/gui/GuiRelay.java | 66 +- .../java/refinedstorage/gui/GuiSolderer.java | 75 +- .../java/refinedstorage/gui/GuiStorage.java | 206 +++-- .../gui/GuiWirelessTransmitter.java | 92 +-- .../java/refinedstorage/gui/Scrollbar.java | 193 ++--- .../gui/sidebutton/SideButton.java | 75 +- .../gui/sidebutton/SideButtonCompare.java | 79 +- .../sidebutton/SideButtonDetectorMode.java | 59 +- .../SideButtonGridSortingDirection.java | 80 +- .../sidebutton/SideButtonGridSortingType.java | 80 +- .../gui/sidebutton/SideButtonMode.java | 82 +- .../sidebutton/SideButtonRedstoneMode.java | 61 +- .../inventory/InventorySimple.java | 287 +++---- .../java/refinedstorage/item/ItemBase.java | 39 +- .../refinedstorage/item/ItemBlockBase.java | 19 +- .../item/ItemBlockController.java | 10 +- .../refinedstorage/item/ItemBlockGrid.java | 10 +- .../refinedstorage/item/ItemBlockStorage.java | 84 +- .../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 | 86 +- .../refinedstorage/item/ItemStoragePart.java | 39 +- .../refinedstorage/item/ItemWirelessGrid.java | 208 ++--- .../item/ItemWirelessGridPlate.java | 12 +- .../jei/PluginRefinedStorage.java | 22 +- .../jei/SoldererRecipeCategory.java | 91 +- .../jei/SoldererRecipeHandler.java | 39 +- .../jei/SoldererRecipeMaker.java | 34 +- .../jei/SoldererRecipeWrapper.java | 133 ++- .../network/MessageCompareUpdate.java | 87 +- .../network/MessageDetectorAmountUpdate.java | 87 +- .../network/MessageDetectorModeUpdate.java | 104 ++- .../network/MessageGridCraftingClear.java | 107 ++- .../network/MessageGridCraftingUpdate.java | 109 ++- .../network/MessageGridSortingUpdate.java | 109 ++- .../network/MessageHandlerPlayerToServer.java | 30 +- .../network/MessageModeToggle.java | 94 +-- .../network/MessagePriorityUpdate.java | 99 +-- .../network/MessageRedstoneModeUpdate.java | 83 +- .../network/MessageStoragePull.java | 161 ++-- .../network/MessageStoragePush.java | 150 ++-- .../network/MessageTileUpdate.java | 95 +-- .../refinedstorage/proxy/ClientProxy.java | 235 +++--- .../refinedstorage/proxy/CommonProxy.java | 692 ++++++++-------- .../refinedstorage/proxy/ServerProxy.java | 3 +- .../refinedstorage/storage/CellStorage.java | 74 +- .../java/refinedstorage/storage/IStorage.java | 16 +- .../refinedstorage/storage/IStorageGui.java | 21 +- .../storage/IStorageProvider.java | 5 +- .../refinedstorage/storage/NBTStorage.java | 209 +++-- .../refinedstorage/storage/StorageItem.java | 352 ++++---- .../refinedstorage/tile/INetworkTile.java | 9 +- .../java/refinedstorage/tile/TileBase.java | 144 ++-- .../java/refinedstorage/tile/TileCable.java | 104 +-- .../refinedstorage/tile/TileConstructor.java | 166 ++-- .../refinedstorage/tile/TileController.java | 780 ++++++++---------- .../refinedstorage/tile/TileDestructor.java | 64 +- .../refinedstorage/tile/TileDetector.java | 391 ++++----- .../java/refinedstorage/tile/TileDrive.java | 632 +++++++------- .../refinedstorage/tile/TileExporter.java | 244 +++--- .../tile/TileExternalStorage.java | 543 ++++++------ .../java/refinedstorage/tile/TileGrid.java | 331 ++++---- .../refinedstorage/tile/TileImporter.java | 365 ++++---- .../refinedstorage/tile/TileInterface.java | 558 ++++++------- .../java/refinedstorage/tile/TileMachine.java | 275 +++--- .../java/refinedstorage/tile/TileRelay.java | 26 +- .../refinedstorage/tile/TileSolderer.java | 523 ++++++------ .../java/refinedstorage/tile/TileStorage.java | 508 ++++++------ .../tile/TileWirelessTransmitter.java | 484 +++++------ .../tile/settings/ICompareSetting.java | 9 +- .../tile/settings/IModeSetting.java | 13 +- .../tile/settings/IRedstoneModeSetting.java | 9 +- .../tile/settings/ModeSettingUtils.java | 74 +- .../tile/settings/RedstoneMode.java | 99 +-- .../tile/solderer/ISoldererRecipe.java | 9 +- .../solderer/SoldererRecipeCraftingGrid.java | 49 +- .../tile/solderer/SoldererRecipeDrive.java | 49 +- .../solderer/SoldererRecipeInterface.java | 49 +- .../SoldererRecipePrintedProcessor.java | 98 +-- .../solderer/SoldererRecipeProcessor.java | 102 +-- .../tile/solderer/SoldererRecipeStorage.java | 62 +- .../solderer/SoldererRecipeWirelessGrid.java | 58 +- .../tile/solderer/SoldererRegistry.java | 97 +-- .../refinedstorage/util/InventoryUtils.java | 478 +++++------ .../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, 7803 insertions(+), 9396 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 3b88573084..ad54e83404 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -16,49 +16,42 @@ 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 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); - } - - @Override - public Item getTabIconItem() - { - return null; - } - }; - - @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") - public static CommonProxy PROXY; - - @Instance - public static RefinedStorage INSTANCE; - - @EventHandler - public void preInit(FMLPreInitializationEvent e) - { - PROXY.preInit(e); - } - - @EventHandler - public void init(FMLInitializationEvent e) - { - PROXY.init(e); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent e) - { - PROXY.postInit(e); - } +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 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; + } + }; + + @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") + public static CommonProxy PROXY; + + @Instance + public static RefinedStorage INSTANCE; + + @EventHandler + public void preInit(FMLPreInitializationEvent e) { + PROXY.preInit(e); + } + + @EventHandler + public void init(FMLInitializationEvent e) { + PROXY.init(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 34a084d99e..f9b83e9b09 --- a/src/main/java/refinedstorage/RefinedStorageBlocks.java +++ b/src/main/java/refinedstorage/RefinedStorageBlocks.java @@ -2,22 +2,21 @@ 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 9c5dce36a0..b154ef6115 --- 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 5d0349c109..cdc5128cc6 --- a/src/main/java/refinedstorage/RefinedStorageItems.java +++ b/src/main/java/refinedstorage/RefinedStorageItems.java @@ -2,14 +2,13 @@ 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 78ae7db9f1..3100bba223 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -18,117 +18,101 @@ import refinedstorage.tile.TileBase; import refinedstorage.util.InventoryUtils; -public abstract class BlockBase extends Block -{ - public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); - - private String name; - - public BlockBase(String name) - { - super(Material.rock); - - this.name = name; - - setHardness(0.6F); - setCreativeTab(RefinedStorage.TAB); - } - - @Override - public String getUnlocalizedName() - { - return "block." + RefinedStorage.ID + ":" + name; - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - }); - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState(); - } - - @Override - public int getMetaFromState(IBlockState state) - { - return 0; - } - - @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()); - } - - return 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); - - if (tile instanceof TileBase) - { - EnumFacing dir = ((TileBase) tile).getDirection(); - - int newDir = dir.ordinal() + 1; - - if (newDir > EnumFacing.VALUES.length - 1) - { - newDir = 0; - } - - ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); - - world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); - - return true; - } - - return false; - } - - @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); - - 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); - - 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); - } +public abstract class BlockBase extends Block { + public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); + + private String name; + + public BlockBase(String name) { + super(Material.rock); + + this.name = name; + + setHardness(0.6F); + setCreativeTab(RefinedStorage.TAB); + } + + @Override + public String getUnlocalizedName() { + return "block." + RefinedStorage.ID + ":" + name; + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + }); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @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()); + } + + return 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); + + if (tile instanceof TileBase) { + EnumFacing dir = ((TileBase) tile).getDirection(); + + int newDir = dir.ordinal() + 1; + + if (newDir > EnumFacing.VALUES.length - 1) { + newDir = 0; + } + + ((TileBase) tile).setDirection(EnumFacing.getFront(newDir)); + + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 2 | 4); + + return true; + } + + return false; + } + + @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); + + 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); + + 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); + } } 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 14429497ea..a470d87044 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -11,82 +11,72 @@ 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 a5cba3d6a7..daf47921b7 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -11,27 +11,22 @@ 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 b2e43dbdc4..d28c88f60a --- 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.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); - - public BlockController() - { - super("controller"); - } - - @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 - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - TYPE, - ENERGY - }); - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); - } - - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; - } - - @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 boolean hasTileEntity(IBlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileController(); - } - - @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()); - } - - return true; - } - - @Override - public void breakBlock(World world, BlockPos pos, IBlockState state) - { - ((TileController) world.getTileEntity(pos)).onDestroyed(); - - super.breakBlock(world, pos, state); - } - - @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); - } +import java.util.List; + +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); + + public BlockController() { + super("controller"); + } + + @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 + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + TYPE, + ENERGY + }); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumControllerType.NORMAL : EnumControllerType.CREATIVE); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumControllerType.NORMAL ? 0 : 1; + } + + @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 boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileController(); + } + + @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()); + } + + return true; + } + + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + ((TileController) world.getTileEntity(pos)).onDestroyed(); + + super.breakBlock(world, pos, state); + } + + @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 1340fec887..230ff82583 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -11,27 +11,22 @@ 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 56c4b09fe1..2b66772f7c --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -16,72 +16,61 @@ 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 383efe7d2c..9f77ef4f22 --- a/src/main/java/refinedstorage/block/BlockDrive.java +++ b/src/main/java/refinedstorage/block/BlockDrive.java @@ -11,27 +11,22 @@ 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 c99a30ccb0..49f3ce855f --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -11,27 +11,22 @@ 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 470db6b9d8..0fff22f584 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -11,27 +11,22 @@ 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 8f4d126211..1a3980d774 --- 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.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 class BlockGrid extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumGridType.class); - public BlockGrid() - { - super("grid"); - } + public BlockGrid() { + super("grid"); + } - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileGrid(); - } + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileGrid(); + } - @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 void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 1; i++) { + subItems.add(new ItemStack(item, 1, i)); + } + } - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); - } + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, meta == 0 ? EnumGridType.NORMAL : EnumGridType.CRAFTING); + } - @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; - } + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(TYPE) == EnumGridType.NORMAL ? 0 : 1; + } - @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 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; - } + 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 80bb1732ba..013d1a33f5 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -11,27 +11,22 @@ 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 54c003f41d..01260204d3 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/src/main/java/refinedstorage/block/BlockInterface.java @@ -11,27 +11,22 @@ 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 c75a2a9e4e..981be3f103 --- a/src/main/java/refinedstorage/block/BlockMachine.java +++ b/src/main/java/refinedstorage/block/BlockMachine.java @@ -8,35 +8,30 @@ 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 9a41b9a93b..26f626b406 --- 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 6b2a6f414b..186da3ad8c --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/refinedstorage/block/BlockRelay.java @@ -12,27 +12,22 @@ 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 9a782c9609..997af4011f --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -11,27 +11,22 @@ 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 286ad9e352..f07ec7e234 --- 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.item.ItemBlockStorage; import refinedstorage.tile.TileStorage; -public class BlockStorage extends BlockMachine -{ - public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); - - public BlockStorage() - { - super("storage"); - } - - @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) - { - for (int i = 0; i <= 4; i++) - { - subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); - } - } - - @Override - protected BlockStateContainer createBlockState() - { - return new BlockStateContainer(this, new IProperty[] - { - DIRECTION, - CONNECTED, - TYPE - }); - } - - @Override - public IBlockState getStateFromMeta(int meta) - { - return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); - } - - @Override - public int getMetaFromState(IBlockState state) - { - return ((EnumStorageType) state.getValue(TYPE)).getId(); - } - - @Override - public TileEntity createTileEntity(World world, IBlockState state) - { - return new TileStorage(); - } - - @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; - } - - @Override - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) - { - super.onBlockPlacedBy(world, pos, state, player, stack); - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) - { - ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); - } - } - - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) - { - List drops = new ArrayList(); - - ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); - - NBTTagCompound tag = new NBTTagCompound(); - - tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); - - stack.setTagCompound(tag); - - drops.add(stack); - - return drops; - } - - @Override - public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) - { - if (willHarvest) - { - return true; - } - - return super.removedByPlayer(state, world, pos, player, willHarvest); - } - - @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); - } +import java.util.ArrayList; +import java.util.List; + +public class BlockStorage extends BlockMachine { + public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumStorageType.class); + + public BlockStorage() { + super("storage"); + } + + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + for (int i = 0; i <= 4; i++) { + subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); + } + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] + { + DIRECTION, + CONNECTED, + TYPE + }); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(TYPE, EnumStorageType.getById(meta)); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumStorageType) state.getValue(TYPE)).getId(); + } + + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileStorage(); + } + + @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; + } + + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, pos, state, player, stack); + + NBTTagCompound tag = stack.getTagCompound(); + + if (tag != null && tag.hasKey(TileStorage.NBT_STORAGE)) { + ((TileStorage) world.getTileEntity(pos)).setStorageTag((NBTTagCompound) tag.getTag(TileStorage.NBT_STORAGE)); + } + } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + List drops = new ArrayList(); + + ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); + + NBTTagCompound tag = new NBTTagCompound(); + + tag.setTag(TileStorage.NBT_STORAGE, ((TileStorage) world.getTileEntity(pos)).getStorageTag()); + + stack.setTagCompound(tag); + + drops.add(stack); + + return drops; + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (willHarvest) { + return true; + } + + return super.removedByPlayer(state, world, pos, player, willHarvest); + } + + @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 9438cc94a9..179d803970 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -16,47 +16,40 @@ 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, 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; - } +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, 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; + } } 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 e64f09d744..7959bfe41c --- a/src/main/java/refinedstorage/block/EnumControllerType.java +++ b/src/main/java/refinedstorage/block/EnumControllerType.java @@ -2,34 +2,29 @@ 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 8c0553ebe3..e2c6ff308f --- a/src/main/java/refinedstorage/block/EnumGridType.java +++ b/src/main/java/refinedstorage/block/EnumGridType.java @@ -2,35 +2,30 @@ import net.minecraft.util.IStringSerializable; -public enum EnumGridType implements IStringSerializable -{ - NORMAL(0, "normal"), - CRAFTING(1, "crafting"); - - private int id; - private String name; - - EnumGridType(int id, String name) - { - this.id = id; - this.name = name; - } - - @Override - public String getName() - { - return name; - } - - public int getId() - { - return id; - } - - @Override - public String toString() - { - return name; - } +public enum EnumGridType implements IStringSerializable { + NORMAL(0, "normal"), + CRAFTING(1, "crafting"); + + private int id; + private String name; + + EnumGridType(int id, String name) { + this.id = id; + this.name = name; + } + + @Override + public String getName() { + return name; + } + + public int getId() { + return id; + } + + @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 0ad8a8708c..85fed352a5 --- a/src/main/java/refinedstorage/block/EnumStorageType.java +++ b/src/main/java/refinedstorage/block/EnumStorageType.java @@ -2,57 +2,48 @@ 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"); - - 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; - } - - @Override - public String getName() - { - return name; - } - - public int getId() - { - return id; - } - - public int getCapacity() - { - return capacity; - } - - @Override - public String toString() - { - return name; - } - - public static EnumStorageType getById(int id) - { - for (EnumStorageType type : EnumStorageType.values()) - { - if (type.getId() == id) - { - return type; - } - } - - return null; - } +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; + + EnumStorageType(int id, int capacity, String name) { + this.id = id; + this.capacity = capacity; + this.name = name; + } + + @Override + public String getName() { + return name; + } + + public int getId() { + return id; + } + + public int getCapacity() { + return capacity; + } + + @Override + public String toString() { + return name; + } + + public static EnumStorageType getById(int id) { + for (EnumStorageType type : EnumStorageType.values()) { + if (type.getId() == id) { + return type; + } + } + + 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 85a14dc933..77224ef327 --- 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 refinedstorage.container.slot.SlotDisabled; import refinedstorage.container.slot.SlotSpecimen; -public abstract class ContainerBase extends Container -{ - private EntityPlayer player; - - private List playerInventorySlots = new ArrayList(); - - public ContainerBase(EntityPlayer player) - { - this.player = player; - } - - public EntityPlayer getPlayer() - { - return player; - } - - protected void addPlayerInventory(int xInventory, int yInventory) - { - int id = 0; - - for (int i = 0; i < 9; i++) - { - Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); - - playerInventorySlots.add(slot); - - addSlotToContainer(slot); - - id++; - } - - 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); - - playerInventorySlots.add(slot); - - addSlotToContainer(slot); - - id++; - } - } - } - - @Override - public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) - { - Slot slot = id >= 0 ? getSlot(id) : null; - - if (slot instanceof SlotSpecimen) - { - if (((SlotSpecimen) slot).isSizeAllowed()) - { - if (player.inventory.getItemStack() != null) - { - int amount = player.inventory.getItemStack().stackSize; - - if (clickedButton == 1) - { - amount = 1; - } - - ItemStack toPut = player.inventory.getItemStack().copy(); - 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); - } - else if (slot.isItemValid(player.inventory.getItemStack())) - { - slot.putStack(player.inventory.getItemStack().copy()); - } - - return player.inventory.getItemStack(); - } - else if (slot instanceof SlotDisabled) - { - return null; - } - - return super.func_184996_a(id, clickedButton, clickType, player); - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) - { - return null; - } - - @Override - public boolean canInteractWith(EntityPlayer player) - { - return true; - } - - public List getPlayerInventorySlots() - { - return playerInventorySlots; - } +import java.util.ArrayList; +import java.util.List; + +public abstract class ContainerBase extends Container { + private EntityPlayer player; + + private List playerInventorySlots = new ArrayList(); + + public ContainerBase(EntityPlayer player) { + this.player = player; + } + + public EntityPlayer getPlayer() { + return player; + } + + protected void addPlayerInventory(int xInventory, int yInventory) { + int id = 0; + + for (int i = 0; i < 9; i++) { + Slot slot = new Slot(player.inventory, id, xInventory + i * 18, yInventory + 4 + (3 * 18)); + + playerInventorySlots.add(slot); + + addSlotToContainer(slot); + + id++; + } + + 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); + + playerInventorySlots.add(slot); + + addSlotToContainer(slot); + + id++; + } + } + } + + @Override + public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player) { + Slot slot = id >= 0 ? getSlot(id) : null; + + if (slot instanceof SlotSpecimen) { + if (((SlotSpecimen) slot).isSizeAllowed()) { + if (player.inventory.getItemStack() != null) { + int amount = player.inventory.getItemStack().stackSize; + + if (clickedButton == 1) { + amount = 1; + } + + ItemStack toPut = player.inventory.getItemStack().copy(); + 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); + } else if (slot.isItemValid(player.inventory.getItemStack())) { + slot.putStack(player.inventory.getItemStack().copy()); + } + + return player.inventory.getItemStack(); + } else if (slot instanceof SlotDisabled) { + return null; + } + + return super.func_184996_a(id, clickedButton, clickType, player); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { + return null; + } + + @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 9e780e64bc..910dfcebb9 --- a/src/main/java/refinedstorage/container/ContainerConstructor.java +++ b/src/main/java/refinedstorage/container/ContainerConstructor.java @@ -7,28 +7,23 @@ 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 9cc437a7ed..79b385d7b6 --- a/src/main/java/refinedstorage/container/ContainerController.java +++ b/src/main/java/refinedstorage/container/ContainerController.java @@ -2,12 +2,10 @@ 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 ed279dd821..ce722492e5 --- a/src/main/java/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/refinedstorage/container/ContainerDestructor.java @@ -2,12 +2,10 @@ 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 b899966105..6b0aed9927 --- a/src/main/java/refinedstorage/container/ContainerDetector.java +++ b/src/main/java/refinedstorage/container/ContainerDetector.java @@ -4,14 +4,12 @@ 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 f62e8dbcf8..a0dc7efd93 --- a/src/main/java/refinedstorage/container/ContainerDrive.java +++ b/src/main/java/refinedstorage/container/ContainerDrive.java @@ -6,20 +6,16 @@ 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 65132fda87..7135754cf5 --- a/src/main/java/refinedstorage/container/ContainerExporter.java +++ b/src/main/java/refinedstorage/container/ContainerExporter.java @@ -4,17 +4,14 @@ 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 e31a62fa3b..6ea9ab6574 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -6,37 +6,32 @@ 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 b5234f5254..49737cc924 --- a/src/main/java/refinedstorage/container/ContainerImporter.java +++ b/src/main/java/refinedstorage/container/ContainerImporter.java @@ -4,17 +4,14 @@ 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 1a2403940e..6defd3f331 --- a/src/main/java/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/refinedstorage/container/ContainerInterface.java @@ -7,63 +7,49 @@ import refinedstorage.container.slot.SlotSpecimen; import refinedstorage.tile.TileInterface; -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 = 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)); - } - - addPlayerInventory(8, 136); - } - - @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 < 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(); - } - } - - return stack; - } +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 = 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)); + } + + addPlayerInventory(8, 136); + } + + @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 < 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(); + } + } + + 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 1048e51f9e..0c8a0a1de4 --- a/src/main/java/refinedstorage/container/ContainerRelay.java +++ b/src/main/java/refinedstorage/container/ContainerRelay.java @@ -2,12 +2,10 @@ 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 70c5ac1bff..a0077fd648 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -6,60 +6,48 @@ 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 7c4fd8974d..dcc1535a76 --- a/src/main/java/refinedstorage/container/ContainerStorage.java +++ b/src/main/java/refinedstorage/container/ContainerStorage.java @@ -4,17 +4,14 @@ 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 802b37dd46..f2365e42b4 --- a/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/refinedstorage/container/ContainerWirelessTransmitter.java @@ -10,52 +10,41 @@ 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; - } +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/container/slot/BasicItemValidator.java b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java old mode 100644 new mode 100755 index 53a1071ac2..eb6c5702c4 --- a/src/main/java/refinedstorage/container/slot/BasicItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/BasicItemValidator.java @@ -3,18 +3,15 @@ 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 5a38125f01..acf5617a7a --- a/src/main/java/refinedstorage/container/slot/IItemValidator.java +++ b/src/main/java/refinedstorage/container/slot/IItemValidator.java @@ -2,7 +2,6 @@ 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 8e68515828..a350b648bd --- 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.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 2d43a1603b..33ba8e4046 --- 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.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 fa110f6b8a..e0db40e0df --- 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.item.ItemStack; import refinedstorage.tile.TileGrid; -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); - - this.craftingMatrix = craftingMatrix; - this.grid = grid; - } - - @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(matrixSlots); - } +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); + + this.craftingMatrix = craftingMatrix; + this.grid = grid; + } + + @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(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 e3e6c3f454..de622aba53 --- 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.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 87ab2a6c6b..e56a98962e --- 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.Slot; import net.minecraft.item.ItemStack; -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); - - this.sizeAllowed = allowSize; - } - - @Override - public boolean canTakeStack(EntityPlayer player) - { - return false; - } - - @Override - public boolean isItemValid(ItemStack stack) - { - return true; - } - - @Override - public void putStack(ItemStack stack) - { - if (stack != null && !sizeAllowed) - { - stack.stackSize = 1; - } - - super.putStack(stack); - } - - public boolean isSizeAllowed() - { - return 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); + + this.sizeAllowed = allowSize; + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + return false; + } + + @Override + public boolean isItemValid(ItemStack stack) { + return true; + } + + @Override + public void putStack(ItemStack stack) { + if (stack != null && !sizeAllowed) { + stack.stackSize = 1; + } + + super.putStack(stack); + } + + 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 d023ee0cbf..25c02d4c9a --- 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 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; - - private List sideButtons = new ArrayList(); - - private int lastButtonId = 0; - private int lastSideButtonY = 6; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public abstract class GuiBase extends GuiContainer { + public static final int SIDE_BUTTON_WIDTH = 20; + public static final int SIDE_BUTTON_HEIGHT = 20; + + private List sideButtons = new ArrayList(); + + private int lastButtonId = 0; + private int lastSideButtonY = 6; + + protected int width; + protected int height; + + public GuiBase(Container container, int width, int height) { + super(container); + + this.width = width; + this.height = height; + this.xSize = width; + this.ySize = height; + } + + @Override + public void initGui() { + if (sideButtons.size() > 0) { + xSize -= SIDE_BUTTON_WIDTH; + } + + super.initGui(); + + sideButtons.clear(); + + lastButtonId = 0; + lastSideButtonY = 6; + + init(guiLeft, guiTop); + + if (sideButtons.size() > 0) { + xSize += SIDE_BUTTON_WIDTH; + } + } + + @Override + public void updateScreen() { + super.updateScreen(); + + update(guiLeft, guiTop); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + drawBackground(guiLeft, guiTop, mouseX, mouseY); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + mouseX -= guiLeft; + mouseY -= guiTop; + + for (SideButton sideButton : sideButtons) { + GL11.glDisable(GL11.GL_LIGHTING); + sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); + GL11.glEnable(GL11.GL_LIGHTING); + + if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) { + drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); + } + } + + drawForeground(mouseX, mouseY); + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); + + for (SideButton sideButton : sideButtons) { + if (sideButton.getId() == button.id) { + sideButton.actionPerformed(); + } + } + } + + public GuiButton addButton(int x, int y, int w, int h) { + return addButton(x, y, w, h, ""); + } + + public GuiButton addButton(int x, int y, int w, int h, String text) { + GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); + + buttonList.add(button); + + return 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); + + lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; + + sideButtons.add(button); + } + + 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 file) { + bindTexture(RefinedStorage.ID, file); + } + + public void bindTexture(String base, String file) { + mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); + } + + 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) { + drawItem(x, y, stack, withOverlay, null); + } + + public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) { + 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) { + itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); + } + + zLevel = 0.0F; + itemRender.zLevel = 0.0F; + } + + public void drawString(int x, int y, String message) { + drawString(x, y, message, 4210752); + } + + 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, String message) { + GL11.glDisable(GL11.GL_LIGHTING); + drawHoveringText(Arrays.asList(message.split("\n")), x, y); + GL11.glEnable(GL11.GL_LIGHTING); + } + + public void drawTooltip(int x, int y, ItemStack stack) { + renderToolTip(stack, x, y); + } + + public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) { + drawTexturedModalRect(x, y, textureX, textureY, width, height); + } + + public String t(String name, Object... format) { + return I18n.translateToLocalFormatted(name, format); + } + + public abstract void init(int x, int y); + + public abstract void update(int x, int y); - protected int width; - protected int height; + public abstract void drawBackground(int x, int y, int mouseX, int mouseY); - public GuiBase(Container container, int width, int height) - { - super(container); - - this.width = width; - this.height = height; - this.xSize = width; - this.ySize = height; - } - - @Override - public void initGui() - { - if (sideButtons.size() > 0) - { - xSize -= SIDE_BUTTON_WIDTH; - } - - super.initGui(); - - sideButtons.clear(); - - lastButtonId = 0; - lastSideButtonY = 6; - - init(guiLeft, guiTop); - - if (sideButtons.size() > 0) - { - xSize += SIDE_BUTTON_WIDTH; - } - } - - @Override - public void updateScreen() - { - super.updateScreen(); - - update(guiLeft, guiTop); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float renderPartialTicks, int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - drawBackground(guiLeft, guiTop, mouseX, mouseY); - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - mouseX -= guiLeft; - mouseY -= guiTop; - - for (SideButton sideButton : sideButtons) - { - GL11.glDisable(GL11.GL_LIGHTING); - sideButton.draw(this, sideButton.getX() + 2, sideButton.getY() + 1); - GL11.glEnable(GL11.GL_LIGHTING); - - if (inBounds(sideButton.getX(), sideButton.getY(), SIDE_BUTTON_WIDTH, SIDE_BUTTON_HEIGHT, mouseX, mouseY)) - { - drawTooltip(mouseX, mouseY, sideButton.getTooltip(this)); - } - } - - drawForeground(mouseX, mouseY); - } - - @Override - protected void actionPerformed(GuiButton button) throws IOException - { - super.actionPerformed(button); - - for (SideButton sideButton : sideButtons) - { - if (sideButton.getId() == button.id) - { - sideButton.actionPerformed(); - } - } - } - - public GuiButton addButton(int x, int y, int w, int h) - { - return addButton(x, y, w, h, ""); - } - - public GuiButton addButton(int x, int y, int w, int h, String text) - { - GuiButton button = new GuiButton(lastButtonId++, x, y, w, h, text); - - buttonList.add(button); - - return 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); - - lastSideButtonY += SIDE_BUTTON_HEIGHT + 4; - - sideButtons.add(button); - } - - 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 file) - { - bindTexture(RefinedStorage.ID, file); - } - - public void bindTexture(String base, String file) - { - mc.getTextureManager().bindTexture(new ResourceLocation(base, "textures/" + file)); - } - - 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) - { - drawItem(x, y, stack, withOverlay, null); - } - - public void drawItem(int x, int y, ItemStack stack, boolean withOverlay, String message) - { - 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) - { - itemRender.renderItemOverlayIntoGUI(font, stack, x, y, message); - } - - zLevel = 0.0F; - itemRender.zLevel = 0.0F; - } - - public void drawString(int x, int y, String message) - { - drawString(x, y, message, 4210752); - } - - 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, String message) - { - GL11.glDisable(GL11.GL_LIGHTING); - drawHoveringText(Arrays.asList(message.split("\n")), x, y); - GL11.glEnable(GL11.GL_LIGHTING); - } - - public void drawTooltip(int x, int y, ItemStack stack) - { - renderToolTip(stack, x, y); - } - - public void drawTexture(int x, int y, int textureX, int textureY, int width, int height) - { - drawTexturedModalRect(x, y, textureX, textureY, width, height); - } - - public String t(String name, Object... format) - { - return I18n.translateToLocalFormatted(name, format); - } - - public abstract void init(int x, int y); - - public abstract void update(int x, int y); - - public abstract void drawBackground(int x, int y, int mouseX, int mouseY); - - public abstract void drawForeground(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 d55805eb70..2b53fa43e4 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -6,43 +6,37 @@ import refinedstorage.tile.TileConstructor; import refinedstorage.util.InventoryUtils; -public class GuiConstructor extends GuiBase -{ - private TileConstructor constructor; - - public GuiConstructor(ContainerConstructor container, TileConstructor constructor) - { - super(container, 176, 137); - - this.constructor = 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)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/constructor.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:constructor")); - drawString(7, 43, t("container.inventory")); - } +public class GuiConstructor extends GuiBase { + private TileConstructor constructor; + + public GuiConstructor(ContainerConstructor container, TileConstructor constructor) { + super(container, 176, 137); + + this.constructor = 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)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/constructor.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:constructor")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java old mode 100644 new mode 100755 index bdb61faa3e..62f7548bc4 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -9,112 +9,97 @@ 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 Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); - - public GuiController(ContainerController container, TileController controller) - { - super(container, 176, 181); - - this.controller = 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 drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/controller.png"); - - drawTexture(x, y, 0, 0, width, height); - - 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); - - scrollbar.draw(this); - } - - @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")); - - int x = 33; - int y = 26; - - int slot = getOffset() * 2; - - 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(); - - 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())); - } - - if (i == 1) - { - x = 33; - y += 30; - } - else - { - x += 60; - } - - 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))); - } - } - - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); - } - - private int getRows() - { - int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); - - return max < 0 ? 0 : max; - } + private int barX = 8; + private int barY = 20; + private int barWidth = 16; + private int barHeight = 59; - private int getVisibleRows() - { - return 2; - } + private Scrollbar scrollbar = new Scrollbar(157, 20, 12, 59); + + public GuiController(ContainerController container, TileController controller) { + super(container, 176, 181); + + this.controller = 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 drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/controller.png"); + + drawTexture(x, y, 0, 0, width, height); + + 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); + + scrollbar.draw(this); + } + + @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")); + + int x = 33; + int y = 26; + + int slot = getOffset() * 2; + + 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(); + + 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())); + } + + if (i == 1) { + x = 33; + y += 30; + } else { + x += 60; + } + + 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))); + } + } + + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 59f * (float) getRows()); + } + + private int getRows() { + int max = (int) Math.ceil((float) controller.getMachines().size() / (float) 2); + + return max < 0 ? 0 : max; + } + + 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 4194a0be0c..247a1ed0ba --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -4,40 +4,34 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; -public class GuiDestructor extends GuiBase -{ - private TileDestructor destructor; - - public GuiDestructor(ContainerDestructor container, TileDestructor destructor) - { - super(container, 176, 131); - - this.destructor = destructor; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(destructor)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/destructor.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:destructor")); - drawString(7, 39, t("container.inventory")); - } +public class GuiDestructor extends GuiBase { + private TileDestructor destructor; + + public GuiDestructor(ContainerDestructor container, TileDestructor destructor) { + super(container, 176, 131); + + this.destructor = destructor; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(destructor)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/destructor.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:destructor")); + drawString(7, 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 bd4c5abf42..f788fa3436 --- 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.tile.TileDetector; import refinedstorage.util.InventoryUtils; -public class GuiDetector extends GuiBase -{ - private TileDetector detector; - - private GuiTextField amountField; - - public GuiDetector(ContainerDetector container, TileDetector detector) - { - super(container, 176, 137); - - this.detector = detector; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); - - addSideButton(new SideButtonDetectorMode(detector)); - - 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 update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/detector.png"); - - drawTexture(x, y, 0, 0, width, height); - - amountField.drawTextBox(); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:detector")); - drawString(7, 43, t("container.inventory")); - } - - @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); - } - } +import java.io.IOException; + +public class GuiDetector extends GuiBase { + private TileDetector detector; + + private GuiTextField amountField; + + public GuiDetector(ContainerDetector container, TileDetector detector) { + super(container, 176, 137); + + this.detector = detector; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); + + addSideButton(new SideButtonDetectorMode(detector)); + + 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 update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/detector.png"); + + drawTexture(x, y, 0, 0, width, height); + + amountField.drawTextBox(); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:detector")); + drawString(7, 43, t("container.inventory")); + } + + @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 364121ec94..42287109e8 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -6,43 +6,37 @@ import refinedstorage.tile.TileExporter; import refinedstorage.util.InventoryUtils; -public class GuiExporter extends GuiBase -{ - private TileExporter exporter; - - public GuiExporter(ContainerExporter container, TileExporter exporter) - { - super(container, 176, 137); - - this.exporter = 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)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/exporter.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:exporter")); - drawString(7, 43, t("container.inventory")); - } +public class GuiExporter extends GuiBase { + private TileExporter exporter; + + public GuiExporter(ContainerExporter container, TileExporter exporter) { + super(container, 176, 137); + + this.exporter = 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)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/exporter.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:exporter")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java old mode 100644 new mode 100755 index 27b6b5c095..3ce054d619 --- 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.tile.TileController; import refinedstorage.tile.TileGrid; -public class GuiGrid extends GuiBase -{ - private ContainerGrid container; - private TileGrid grid; - - private GuiTextField searchField; - - private int hoveringSlotId; - private int hoveringId; - - private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); - - public GuiGrid(ContainerGrid container, TileGrid grid) - { - super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); - - this.container = container; - this.grid = grid; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(grid)); +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; + +public class GuiGrid extends GuiBase { + private ContainerGrid container; + private TileGrid grid; + + private GuiTextField searchField; + + private int hoveringSlotId; + private int hoveringId; + + private Scrollbar scrollbar = new Scrollbar(174, 20, 12, 70); + + public GuiGrid(ContainerGrid container, TileGrid grid) { + super(container, 193, grid.getType() == EnumGridType.CRAFTING ? 256 : 190); + + this.container = container; + this.grid = grid; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(grid)); + + addSideButton(new SideButtonGridSortingDirection(grid)); + addSideButton(new SideButtonGridSortingType(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); + } + + @Override + public void update(int x, int y) { + scrollbar.setCanScroll(getRows() > getVisibleRows()); + } + + public int getOffset() { + return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); + } + + public int getVisibleRows() { + return 4; + } + + public int getRows() { + if (!grid.isConnected()) { + return 0; + } + + int max = (int) Math.ceil((float) getItems().size() / (float) 9); + + return max < 0 ? 0 : max; + } + + private boolean isHoveringOverValidSlot(List items) { + return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); + } + + private boolean isHoveringOverSlot() { + return hoveringSlotId >= 0; + } + + public boolean isHoveringOverClear(int mouseX, int mouseY) { + if (grid.getType() == EnumGridType.CRAFTING) { + return inBounds(81, 105, 7, 7, mouseX, mouseY); + } + + return false; + } + + @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"); + } + + drawTexture(x, y, 0, 0, width, height); + + scrollbar.draw(this); + + searchField.drawTextBox(); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + scrollbar.update(this, mouseX, mouseY); + + drawString(7, 7, t("gui.refinedstorage:grid")); + + if (grid.getType() == EnumGridType.CRAFTING) { + drawString(7, 94, t("container.crafting")); + } + + drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, 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.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); + } + + drawItem(x, y, items.get(slot).toItemStack(), true, text); + } - addSideButton(new SideButtonGridSortingDirection(grid)); - addSideButton(new SideButtonGridSortingType(grid)); + if (inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isConnected()) { + hoveringSlotId = slot; - 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); - } + 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(); + } - @Override - public void update(int x, int y) - { - scrollbar.setCanScroll(getRows() > getVisibleRows()); - } + int color = grid.isConnected() ? -2130706433 : 0xFF5B5B5B; - public int getOffset() - { - return (int) (scrollbar.getCurrentScroll() / 70f * (float) getRows()); - } - - public int getVisibleRows() - { - return 4; - } - - public int getRows() - { - if (!grid.isConnected()) - { - return 0; - } - - int max = (int) Math.ceil((float) getItems().size() / (float) 9); - - return max < 0 ? 0 : max; - } - - private boolean isHoveringOverValidSlot(List items) - { - return grid.isConnected() && isHoveringOverSlot() && hoveringSlotId < items.size(); - } - - private boolean isHoveringOverSlot() - { - return hoveringSlotId >= 0; - } - - public boolean isHoveringOverClear(int mouseX, int mouseY) - { - if (grid.getType() == EnumGridType.CRAFTING) - { - return inBounds(81, 105, 7, 7, mouseX, mouseY); - } - - return false; - } - - @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"); - } - - drawTexture(x, y, 0, 0, width, height); - - scrollbar.draw(this); - - searchField.drawTextBox(); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - scrollbar.update(this, mouseX, mouseY); - - drawString(7, 7, t("gui.refinedstorage:grid")); - - if (grid.getType() == EnumGridType.CRAFTING) - { - drawString(7, 94, t("container.crafting")); - } - - drawString(7, grid.getType() == EnumGridType.CRAFTING ? 163 : 96, 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.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); - } - - 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(); - 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")); - } - } - - public List getItems() - { - List items = new ArrayList(); - - if (!grid.isConnected()) - { - return items; - } - - 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(); - } - } - } - - 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()); - } - - 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 0; - } - }); - } - - return items; - } - - @Override - public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException - { - super.mouseClicked(mouseX, mouseY, clickedButton); - - boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); - - if (grid.isConnected()) - { - TileController controller = grid.getController(); - - 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; - - 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 (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); - } - } + 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")); + } + } + + public List getItems() { + List items = new ArrayList(); + + if (!grid.isConnected()) { + return items; + } + + 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(); + } + } + } + + 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()); + } + + 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 0; + } + }); + } + + return items; + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int clickedButton) throws IOException { + super.mouseClicked(mouseX, mouseY, clickedButton); + + boolean clickedClear = clickedButton == 0 && isHoveringOverClear(mouseX - guiLeft, mouseY - guiTop); + + if (grid.isConnected()) { + TileController controller = grid.getController(); + + 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; + + 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 (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 11b33452a2..5273c36024 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -11,84 +11,78 @@ 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 398cd87577..5211687492 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -7,45 +7,39 @@ import refinedstorage.tile.TileImporter; import refinedstorage.util.InventoryUtils; -public class GuiImporter extends GuiBase -{ - private TileImporter importer; - - public GuiImporter(ContainerImporter container, TileImporter importer) - { - super(container, 176, 137); - - this.importer = importer; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(importer)); - - addSideButton(new SideButtonMode(importer)); - - 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 drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/importer.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:importer")); - drawString(7, 43, t("container.inventory")); - } +public class GuiImporter extends GuiBase { + private TileImporter importer; + + public GuiImporter(ContainerImporter container, TileImporter importer) { + super(container, 176, 137); + + this.importer = importer; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(importer)); + + addSideButton(new SideButtonMode(importer)); + + 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 drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/importer.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:importer")); + drawString(7, 43, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java old mode 100644 new mode 100755 index d7deb39a15..2a402f3a67 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -6,53 +6,46 @@ import refinedstorage.tile.TileInterface; import refinedstorage.util.InventoryUtils; -public class GuiInterface extends GuiBase -{ - private TileInterface tile; - - public GuiInterface(ContainerInterface container, TileInterface tile) - { - super(container, 176, 218); - - this.tile = 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)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/interface.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:interface.import")); - drawString(7, 42, t("gui.refinedstorage:interface.export")); - drawString(7, 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); - } - } +public class GuiInterface extends GuiBase { + private TileInterface tile; + + public GuiInterface(ContainerInterface container, TileInterface tile) { + super(container, 176, 218); + + this.tile = 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)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/interface.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:interface.import")); + drawString(7, 42, t("gui.refinedstorage:interface.export")); + drawString(7, 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/java/refinedstorage/gui/GuiRelay.java b/src/main/java/refinedstorage/gui/GuiRelay.java old mode 100644 new mode 100755 index e1cfefd9ed..b50810d9b3 --- a/src/main/java/refinedstorage/gui/GuiRelay.java +++ b/src/main/java/refinedstorage/gui/GuiRelay.java @@ -4,40 +4,34 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileRelay; -public class GuiRelay extends GuiBase -{ - private TileRelay relay; - - public GuiRelay(ContainerRelay container, TileRelay relay) - { - super(container, 176, 131); - - this.relay = relay; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(relay)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/relay.png"); - - drawTexture(x, y, 0, 0, width, height); - } - - @Override - public void drawForeground(int mouseX, int mouseY) - { - drawString(7, 7, t("gui.refinedstorage:relay")); - drawString(7, 39, t("container.inventory")); - } +public class GuiRelay extends GuiBase { + private TileRelay relay; + + public GuiRelay(ContainerRelay container, TileRelay relay) { + super(container, 176, 131); + + this.relay = relay; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(relay)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/relay.png"); + + drawTexture(x, y, 0, 0, width, height); + } + + @Override + public void drawForeground(int mouseX, int mouseY) { + drawString(7, 7, t("gui.refinedstorage:relay")); + drawString(7, 39, t("container.inventory")); + } } diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java old mode 100644 new mode 100755 index 01903ac427..f487e70bbb --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -4,45 +4,38 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileSolderer; -public class GuiSolderer extends GuiBase -{ - private TileSolderer solderer; - - public GuiSolderer(Container container, TileSolderer solderer) - { - super(container, 176, 177); - - this.solderer = solderer; - } - - @Override - public void init(int x, int y) - { - addSideButton(new SideButtonRedstoneMode(solderer)); - } - - @Override - public void update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture("gui/solderer.png"); - - drawTexture(x, y, 0, 0, width, height); - - if (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")); - } +public class GuiSolderer extends GuiBase { + private TileSolderer solderer; + + public GuiSolderer(Container container, TileSolderer solderer) { + super(container, 176, 177); + + this.solderer = solderer; + } + + @Override + public void init(int x, int y) { + addSideButton(new SideButtonRedstoneMode(solderer)); + } + + @Override + public void update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture("gui/solderer.png"); + + drawTexture(x, y, 0, 0, width, height); + + if (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")); + } } 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 ad60dacb69..f6f1bd1de3 --- 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.storage.IStorageGui; import refinedstorage.util.InventoryUtils; -public class GuiStorage extends GuiBase -{ - private IStorageGui gui; - private String texture; - - private GuiTextField priorityField; - - private int barX = 8; - private int barY = 54; - private int barWidth = 16; - private int barHeight = 58; - - public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) - { - super(container, 176, 211); - - this.gui = gui; - this.texture = texture; - } - - public GuiStorage(ContainerStorage container, IStorageGui gui) - { - this(container, gui, "gui/storage.png"); - } - - @Override - public void init(int x, int y) - { - if (gui.getRedstoneModeSetting() != null) - { - addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); - } - - if (gui.getModeSetting() != null) - { - addSideButton(new SideButtonMode(gui.getModeSetting())); - } - - if (gui.getCompareSetting() != null) - { - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); - } - - 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 update(int x, int y) - { - } - - @Override - public void drawBackground(int x, int y, int mouseX, int mouseY) - { - bindTexture(texture); - - drawTexture(x, y, 0, 0, width, height); - - int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); - - drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); - - priorityField.drawTextBox(); - } - - @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 (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) - { - int full = 0; - - if (gui.getCapacity() >= 0) - { - full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); - } - - drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); - } - } - - @Override - protected void 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); - } - } +import java.io.IOException; + +public class GuiStorage extends GuiBase { + private IStorageGui gui; + private String texture; + + private GuiTextField priorityField; + + private int barX = 8; + private int barY = 54; + private int barWidth = 16; + private int barHeight = 58; + + public GuiStorage(ContainerStorage container, IStorageGui gui, String texture) { + super(container, 176, 211); + + this.gui = gui; + this.texture = texture; + } + + public GuiStorage(ContainerStorage container, IStorageGui gui) { + this(container, gui, "gui/storage.png"); + } + + @Override + public void init(int x, int y) { + if (gui.getRedstoneModeSetting() != null) { + addSideButton(new SideButtonRedstoneMode(gui.getRedstoneModeSetting())); + } + + if (gui.getModeSetting() != null) { + addSideButton(new SideButtonMode(gui.getModeSetting())); + } + + if (gui.getCompareSetting() != null) { + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(gui.getCompareSetting(), InventoryUtils.COMPARE_NBT)); + } + + 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 update(int x, int y) { + } + + @Override + public void drawBackground(int x, int y, int mouseX, int mouseY) { + bindTexture(texture); + + drawTexture(x, y, 0, 0, width, height); + + int barHeightNew = (int) ((float) gui.getStored() / (float) gui.getCapacity() * (float) barHeight); + + drawTexture(x + barX, y + barY + barHeight - barHeightNew, 179, 0 + (barHeight - barHeightNew), barWidth, barHeightNew); + + priorityField.drawTextBox(); + } + + @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 (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { + int full = 0; + + if (gui.getCapacity() >= 0) { + full = (int) ((float) gui.getStored() / (float) gui.getCapacity() * 100f); + } + + drawTooltip(mouseX, mouseY, t("misc.refinedstorage:storage.full", full)); + } + } + + @Override + protected void 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 530cf06810..2b431717a0 --- a/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiWirelessTransmitter.java @@ -4,54 +4,46 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileWirelessTransmitter; -public class GuiWirelessTransmitter extends GuiBase -{ - private TileWirelessTransmitter wirelessTransmitter; - - public GuiWirelessTransmitter(Container 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, 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")); - - 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 + "%"); - } - } +public class GuiWirelessTransmitter extends GuiBase { + private TileWirelessTransmitter wirelessTransmitter; + + public GuiWirelessTransmitter(Container 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, 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")); + + 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/gui/Scrollbar.java b/src/main/java/refinedstorage/gui/Scrollbar.java old mode 100644 new mode 100755 index 6a1fe734c3..f79aa0dcf4 --- a/src/main/java/refinedstorage/gui/Scrollbar.java +++ b/src/main/java/refinedstorage/gui/Scrollbar.java @@ -2,110 +2,91 @@ import org.lwjgl.input.Mouse; -public class Scrollbar -{ - private boolean canScroll = true; - - private int x; - private int y; - private int scrollbarWidth; - private int scrollbarHeight; - - 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 void setCanScroll(boolean canScroll) - { - this.canScroll = canScroll; - } - - public boolean canScroll() - { - return canScroll; - } - - public float getCurrentScroll() - { - return currentScroll; - } - - public void setCurrentScroll(float newCurrentScroll) - { - if (newCurrentScroll < 0) - { - newCurrentScroll = 0; - } - - int scrollbarItselfHeight = 12; - - int max = scrollbarHeight - scrollbarItselfHeight - 3; - - if (newCurrentScroll > max) - { - newCurrentScroll = max; - } - - 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 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); - - float delta = 15; - - if (wheel == -1) - { - setCurrentScroll(currentScroll - delta); - } - else if (wheel == 1) - { - setCurrentScroll(currentScroll + delta); - } - - boolean down = Mouse.isButtonDown(0); - - if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) - { - isScrolling = true; - } - - if (!down) - { - isScrolling = false; - } - - wasClicking = down; - - if (isScrolling) - { - setCurrentScroll(mouseY - 20); - } - } - } +public class Scrollbar { + private boolean canScroll = true; + + private int x; + private int y; + private int scrollbarWidth; + private int scrollbarHeight; + + 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 void setCanScroll(boolean canScroll) { + this.canScroll = canScroll; + } + + public boolean canScroll() { + return canScroll; + } + + public float getCurrentScroll() { + return currentScroll; + } + + public void setCurrentScroll(float newCurrentScroll) { + if (newCurrentScroll < 0) { + newCurrentScroll = 0; + } + + int scrollbarItselfHeight = 12; + + int max = scrollbarHeight - scrollbarItselfHeight - 3; + + if (newCurrentScroll > max) { + newCurrentScroll = max; + } + + 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 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); + + float delta = 15; + + if (wheel == -1) { + setCurrentScroll(currentScroll - delta); + } else if (wheel == 1) { + setCurrentScroll(currentScroll + delta); + } + + boolean down = Mouse.isButtonDown(0); + + if (!wasClicking && down && gui.inBounds(x, y, scrollbarWidth, scrollbarHeight, mouseX, mouseY)) { + isScrolling = true; + } + + if (!down) { + isScrolling = false; + } + + wasClicking = down; + + 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 6a1de411dd..ce2e9faf00 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButton.java @@ -2,45 +2,38 @@ import refinedstorage.gui.GuiBase; -public abstract class SideButton -{ - private int id; - private int x; - private int y; - - public int getId() - { - return id; - } - - public void setId(int id) - { - this.id = id; - } - - public int getX() - { - return x; - } - - public void setX(int x) - { - this.x = x; - } - - public int getY() - { - return y; - } - - public void setY(int y) - { - this.y = y; - } - - public abstract String getTooltip(GuiBase gui); - - public abstract void draw(GuiBase gui, int x, int y); - - public abstract void actionPerformed(); +public abstract class SideButton { + private int id; + private int x; + private int y; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + + public abstract String getTooltip(GuiBase gui); + + public abstract void draw(GuiBase gui, int x, int y); + + 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 9180ad1c3a..f2bde94526 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -7,60 +7,49 @@ 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 f7da67f5b1..351c23594c --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java @@ -8,36 +8,31 @@ import refinedstorage.network.MessageDetectorModeUpdate; import refinedstorage.tile.TileDetector; -public class SideButtonDetectorMode extends SideButton -{ - private TileDetector detector; - - public SideButtonDetectorMode(TileDetector detector) - { - this.detector = detector; - } - - @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(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); - - 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 actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageDetectorModeUpdate(detector)); - } +public class SideButtonDetectorMode extends SideButton { + private TileDetector detector; + + public SideButtonDetectorMode(TileDetector detector) { + this.detector = detector; + } + + @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(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode())); + + 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 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 f0f49dc481..92f6a0cbe0 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java @@ -6,48 +6,40 @@ import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingDirection extends SideButton -{ - private TileGrid grid; - - public SideButtonGridSortingDirection(TileGrid grid) - { - this.grid = grid; - } - - @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(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); - - 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 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; - } - - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, dir, grid.getSortingType())); - } +public class SideButtonGridSortingDirection extends SideButton { + private TileGrid grid; + + public SideButtonGridSortingDirection(TileGrid grid) { + this.grid = grid; + } + + @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(gui.t("sidebutton.refinedstorage:sorting.direction." + grid.getSortingDirection())); + + 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 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; + } + + 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 7403bc4a8d..38ffc43d39 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -6,48 +6,40 @@ import refinedstorage.network.MessageGridSortingUpdate; import refinedstorage.tile.TileGrid; -public class SideButtonGridSortingType extends SideButton -{ - private TileGrid grid; - - public SideButtonGridSortingType(TileGrid grid) - { - this.grid = grid; - } - - @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(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); - - 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 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; - } - - RefinedStorage.NETWORK.sendToServer(new MessageGridSortingUpdate(grid, grid.getSortingDirection(), type)); - } +public class SideButtonGridSortingType extends SideButton { + private TileGrid grid; + + public SideButtonGridSortingType(TileGrid grid) { + this.grid = grid; + } + + @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(gui.t("sidebutton.refinedstorage:sorting.type." + grid.getSortingType())); + + 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 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; + } + + 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 a251b29928..6191b47e19 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java @@ -6,49 +6,41 @@ import refinedstorage.network.MessageModeToggle; import refinedstorage.tile.settings.IModeSetting; -public class SideButtonMode extends SideButton -{ - private IModeSetting mode; - - public SideButtonMode(IModeSetting mode) - { - this.mode = mode; - } - - @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(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); - - return builder.toString(); - } - - @Override - public void draw(GuiBase gui, int x, int y) - { - gui.bindTexture("icons.png"); - - int tx = 0; - - if (mode.isWhitelist()) - { - tx = 0; - } - else if (mode.isBlacklist()) - { - tx = 16; - } - - gui.drawTexture(x, y + 1, tx, 64, 16, 16); - } - - @Override - public void actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageModeToggle(mode)); - } +public class SideButtonMode extends SideButton { + private IModeSetting mode; + + public SideButtonMode(IModeSetting mode) { + this.mode = mode; + } + + @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(gui.t("sidebutton.refinedstorage:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist"))); + + return builder.toString(); + } + + @Override + public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + + int tx = 0; + + if (mode.isWhitelist()) { + tx = 0; + } else if (mode.isBlacklist()) { + tx = 16; + } + + gui.drawTexture(x, y + 1, tx, 64, 16, 16); + } + + @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 82f92487ac..fcbfe747eb --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java @@ -6,37 +6,32 @@ import refinedstorage.network.MessageRedstoneModeUpdate; import refinedstorage.tile.settings.IRedstoneModeSetting; -public class SideButtonRedstoneMode extends SideButton -{ - private IRedstoneModeSetting setting; - - public SideButtonRedstoneMode(IRedstoneModeSetting setting) - { - this.setting = setting; - } - - @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(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); - - 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 actionPerformed() - { - RefinedStorage.NETWORK.sendToServer(new MessageRedstoneModeUpdate(setting)); - } +public class SideButtonRedstoneMode extends SideButton { + private IRedstoneModeSetting setting; + + public SideButtonRedstoneMode(IRedstoneModeSetting setting) { + this.setting = setting; + } + + @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(gui.t("sidebutton.refinedstorage:redstone_mode." + setting.getRedstoneMode().id)); + + 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 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 0b76fb9494..69aae195d4 --- a/src/main/java/refinedstorage/inventory/InventorySimple.java +++ b/src/main/java/refinedstorage/inventory/InventorySimple.java @@ -6,162 +6,133 @@ 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 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); - - this.tile = tile; - } - - @Override - public int getSizeInventory() - { - return size; - } - - @Override - public ItemStack getStackInSlot(int slotIndex) - { - return inventory[slotIndex]; - } - - @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.stackSize == 0) - { - setInventorySlotContents(slot, null); - } - } - } - - return stack; - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - ItemStack stack = getStackInSlot(slot); - - if (stack != null) - { - setInventorySlotContents(slot, null); - } - - return stack; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - if (stack != null && stack.stackSize > getInventoryStackLimit()) - { - stack.stackSize = getInventoryStackLimit(); - } - - inventory[slot] = stack; - } - - @Override - public String getName() - { - return this.name; - } - - @Override - public boolean hasCustomName() - { - return true; - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return true; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return true; - } - - @Override - public void markDirty() - { - if (tile != null) - { - tile.markDirty(); - } - } - - @Override - public void openInventory(EntityPlayer playerIn) - { - } - - @Override - public void closeInventory(EntityPlayer playerIn) - { - } - - @Override - public int getField(int id) - { - return 0; - } - - @Override - public void setField(int id, int value) - { - } - - @Override - public int getFieldCount() - { - return 0; - } - - @Override - public void clear() - { - } - - @Override - public ITextComponent getDisplayName() - { - return null; - } +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, TileEntity tile) { + this(name, size); + + this.tile = tile; + } + + @Override + public int getSizeInventory() { + return size; + } + + @Override + public ItemStack getStackInSlot(int slotIndex) { + return inventory[slotIndex]; + } + + @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.stackSize == 0) { + setInventorySlotContents(slot, null); + } + } + } + + return stack; + } + + @Override + public ItemStack removeStackFromSlot(int slot) { + ItemStack stack = getStackInSlot(slot); + + if (stack != null) { + setInventorySlotContents(slot, null); + } + + return stack; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + if (stack != null && stack.stackSize > getInventoryStackLimit()) { + stack.stackSize = getInventoryStackLimit(); + } + + inventory[slot] = stack; + } + + @Override + public String getName() { + return this.name; + } + + @Override + public boolean hasCustomName() { + return true; + } + + @Override + public int getInventoryStackLimit() { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + return true; + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return true; + } + + @Override + public void markDirty() { + if (tile != null) { + tile.markDirty(); + } + } + + @Override + public void openInventory(EntityPlayer playerIn) { + } + + @Override + public void closeInventory(EntityPlayer playerIn) { + } + + @Override + public int getField(int id) { + return 0; + } + + @Override + public void setField(int id, int value) { + } + + @Override + public int getFieldCount() { + return 0; + } + + @Override + public void clear() { + } + + @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 48f25c383e..1f4beb7b51 --- a/src/main/java/refinedstorage/item/ItemBase.java +++ b/src/main/java/refinedstorage/item/ItemBase.java @@ -4,31 +4,26 @@ 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 338e830264..b2a21469ac --- a/src/main/java/refinedstorage/item/ItemBlockBase.java +++ b/src/main/java/refinedstorage/item/ItemBlockBase.java @@ -4,16 +4,13 @@ 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 73d0e48430..bd5c4e62d4 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -2,10 +2,8 @@ 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 3a13a1114a..ef8aa2ede7 --- a/src/main/java/refinedstorage/item/ItemBlockGrid.java +++ b/src/main/java/refinedstorage/item/ItemBlockGrid.java @@ -2,10 +2,8 @@ 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 0d4cb264a4..6a4b85c8bd --- 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.storage.NBTStorage; import refinedstorage.tile.TileStorage; -public class ItemBlockStorage extends ItemBlockBase -{ - public ItemBlockStorage(Block block) - { - super(block); - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) - { - EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); - - if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) - { - NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); - - 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())); - } - } - } - - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); - - initNBT(stack); - } - - public static ItemStack initNBT(ItemStack stack) - { - NBTTagCompound tag = new NBTTagCompound(); - - tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); - - stack.setTagCompound(tag); - - return stack; - } +import java.util.List; + +public class ItemBlockStorage extends ItemBlockBase { + public ItemBlockStorage(Block block) { + super(block); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { + EnumStorageType type = EnumStorageType.getById(stack.getMetadata()); + + if (type != null && stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE)) { + NBTTagCompound tag = stack.getTagCompound().getCompoundTag(TileStorage.NBT_STORAGE); + + 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())); + } + } + } + + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); + + initNBT(stack); + } + + public static ItemStack initNBT(ItemStack stack) { + NBTTagCompound tag = new NBTTagCompound(); + + tag.setTag(TileStorage.NBT_STORAGE, NBTStorage.getBaseNBT()); + + 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 376400dafa..9028b7aeea --- 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 class ItemCore extends ItemBase { + public static final int TYPE_CONSTRUCTION = 0; + public static final int TYPE_DESTRUCTION = 1; - public ItemCore() - { - super("core"); + public ItemCore() { + super("core"); - setHasSubtypes(true); - setMaxDamage(0); - } + 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)); - } - } + @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 fa7c442bef..b60613ff1c --- 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 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; - public ItemProcessor() - { - super("processor"); + public ItemProcessor() { + super("processor"); - setHasSubtypes(true); - setMaxDamage(0); - } + 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)); - } - } + @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 1cb33b0318..c943fb9504 --- 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 d6cd6dce33..8217d0b25e --- 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 78f809f171..e649f6dadf --- 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 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; - - public ItemStorageCell() - { - super("storage_cell"); - - setMaxStackSize(1); - setHasSubtypes(true); - setMaxDamage(0); - } - - @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 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 onCreated(ItemStack stack, World world, EntityPlayer player) - { - super.onCreated(stack, world, player); - - NBTStorage.initNBT(stack); - } +import java.util.List; + +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; + + public ItemStorageCell() { + super("storage_cell"); + + setMaxStackSize(1); + setHasSubtypes(true); + setMaxDamage(0); + } + + @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 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 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 0f282b5c9c..509378f43a --- 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 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; - public ItemStoragePart() - { - super("storage_part"); + public ItemStoragePart() { + super("storage_part"); - setHasSubtypes(true); - setMaxDamage(0); - } + 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)); - } - } + @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 19d25cbb43..884dcd9313 --- 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.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"; - - 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))); - } - } - - @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(x, y, z)); - - 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"))); - } - } - 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()))); - } - - return new ActionResult(EnumActionResult.FAIL, stack); - } - else - { - return new ActionResult(EnumActionResult.PASS, stack); - } - } - - public static int getX(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); - } - - public static int getY(ItemStack stack) - { - return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); - } - - public static int getZ(ItemStack stack) - { - return stack.getTagCompound().getInteger(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); - } +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 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))); + } + } + + @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(x, y, z)); + + 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"))); + } + } 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()))); + } + + return new ActionResult(EnumActionResult.FAIL, stack); + } else { + return new ActionResult(EnumActionResult.PASS, stack); + } + } + + public static int getX(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_X); + } + + public static int getY(ItemStack stack) { + return stack.getTagCompound().getInteger(NBT_WIRELESS_TRANSMITTER_Y); + } + + public static int getZ(ItemStack stack) { + return stack.getTagCompound().getInteger(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 89187280df..23f2308cad --- 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 678d28d283..382a3cce34 --- a/src/main/java/refinedstorage/jei/PluginRefinedStorage.java +++ b/src/main/java/refinedstorage/jei/PluginRefinedStorage.java @@ -10,19 +10,17 @@ 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 16bf847f3f..216dfcefd0 --- a/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeCategory.java @@ -11,68 +11,57 @@ 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 86e95b3e52..8f0c3f52c7 --- a/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java +++ b/src/main/java/refinedstorage/jei/SoldererRecipeHandler.java @@ -3,29 +3,24 @@ 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 c746339e7c..ae2b726949 --- 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; + +public class SoldererRecipeMaker { + public static List getRecipes() { + List recipes = new ArrayList(); - for (ISoldererRecipe recipe : SoldererRegistry.recipes) - { - List inputs = new ArrayList(); + for (ISoldererRecipe recipe : SoldererRegistry.recipes) { + List inputs = new ArrayList(); - inputs.add(recipe.getRow(0)); - inputs.add(recipe.getRow(1)); - inputs.add(recipe.getRow(2)); + inputs.add(recipe.getRow(0)); + inputs.add(recipe.getRow(1)); + inputs.add(recipe.getRow(2)); - ItemStack output = recipe.getResult(); + ItemStack output = recipe.getResult(); - recipes.add(new SoldererRecipeWrapper(inputs, output)); - } + recipes.add(new SoldererRecipeWrapper(inputs, output)); + } - return recipes; - } + 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 0f181c48b4..3a045d8817 --- 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; - - public SoldererRecipeWrapper(List inputs, ItemStack output) - { - this.inputs = inputs; - this.output = output; - - int available = 0; - - for (int i = 0; i < 3; ++i) - { - if (inputs.get(i) != null) - { - available = i; - - break; - } - } - - hashCode = Objects.hashCode(inputs.get(available), output); - } - - @Override - public List getInputs() - { - return inputs; - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } - - @Override - public boolean equals(Object obj) - { - if (!(obj instanceof SoldererRecipeWrapper)) - { - return false; - } - - SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; - - for (int i = 0; i < inputs.size(); i++) - { - if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) - { - return false; - } - } - - return ItemStack.areItemStacksEqual(output, other.output); - } - - @Override - public int hashCode() - { - return hashCode; - } - - @Override - public String toString() - { - return inputs + " = " + output; - } +import java.util.Collections; +import java.util.List; + +public class SoldererRecipeWrapper extends VanillaRecipeWrapper { + private int hashCode; + private List inputs; + private ItemStack output; + + public SoldererRecipeWrapper(List inputs, ItemStack output) { + this.inputs = inputs; + this.output = output; + + int available = 0; + + for (int i = 0; i < 3; ++i) { + if (inputs.get(i) != null) { + available = i; + + break; + } + } + + hashCode = Objects.hashCode(inputs.get(available), output); + } + + @Override + public List getInputs() { + return inputs; + } + + @Override + public List getOutputs() { + return Collections.singletonList(output); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SoldererRecipeWrapper)) { + return false; + } + + SoldererRecipeWrapper other = (SoldererRecipeWrapper) obj; + + for (int i = 0; i < inputs.size(); i++) { + if (!ItemStack.areItemStacksEqual(inputs.get(i), other.inputs.get(i))) { + return false; + } + } + + return ItemStack.areItemStacksEqual(output, other.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 adbc4bf535..17ec03cc28 --- a/src/main/java/refinedstorage/network/MessageCompareUpdate.java +++ b/src/main/java/refinedstorage/network/MessageCompareUpdate.java @@ -7,51 +7,44 @@ 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 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; - } - - @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 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); - } - } +public class MessageCompareUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int compare; + + 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; + } + + @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 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); + } + } } 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 c097cb0d8a..6212379163 --- a/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorAmountUpdate.java @@ -7,51 +7,44 @@ 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 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; - } - - @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 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); - } - } +public class MessageDetectorAmountUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int amount; + + 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; + } + + @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 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); + } + } } 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 5c5e2a9b98..4b29054268 --- a/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageDetectorModeUpdate.java @@ -7,60 +7,52 @@ 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 MessageDetectorModeUpdate() - { - } - - 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 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)); - - 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; - } - } - } +public class MessageDetectorModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + + public MessageDetectorModeUpdate() { + } + + 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 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)); + + 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; + } + } + } } 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 6b13bac1c5..ef3bc8cf33 --- a/src/main/java/refinedstorage/network/MessageGridCraftingClear.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingClear.java @@ -9,63 +9,52 @@ 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 MessageGridCraftingClear() - { - } - - 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 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)); - - 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 (slot != null) - { - if (grid.getController().push(slot)) - { - grid.getCraftingInventory().setInventorySlotContents(i, null); - } - } - } - } - } - } +public class MessageGridCraftingClear extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + + public MessageGridCraftingClear() { + } + + 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 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)); + + 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 (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 78f1b133e2..37fb7c0dfb --- 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.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 1f2ac8f42b..11781aec16 --- a/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridSortingUpdate.java @@ -7,63 +7,54 @@ 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 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; - } - - @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 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 (message.sortingType == TileGrid.SORTING_TYPE_QUANTITY || message.sortingType == TileGrid.SORTING_TYPE_NAME) - { - ((TileGrid) tile).setSortingType(message.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(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 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)); + + 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); + } + } + } } 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 2c6c1bc447..d26898d4b8 --- 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.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 0085479cf8..7c986c15e2 --- a/src/main/java/refinedstorage/network/MessageModeToggle.java +++ b/src/main/java/refinedstorage/network/MessageModeToggle.java @@ -7,56 +7,46 @@ 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 MessageModeToggle() - { - } - - 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 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)); - - if (tile instanceof IModeSetting) - { - IModeSetting mode = (IModeSetting) tile; - - if (mode.isWhitelist()) - { - mode.setToBlacklist(); - } - else if (mode.isBlacklist()) - { - mode.setToWhitelist(); - } - } - } +public class MessageModeToggle extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + + public MessageModeToggle() { + } + + 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 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)); + + if (tile instanceof IModeSetting) { + IModeSetting mode = (IModeSetting) tile; + + 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 16a648e515..89ab018cf8 --- a/src/main/java/refinedstorage/network/MessagePriorityUpdate.java +++ b/src/main/java/refinedstorage/network/MessagePriorityUpdate.java @@ -9,59 +9,48 @@ 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 MessagePriorityUpdate() - { - } - - 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 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)); - - 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); - } - } +public class MessagePriorityUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + private int priority; + + public MessagePriorityUpdate() { + } + + 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 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)); + + 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 9e12224b4b..e664977cda --- a/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java +++ b/src/main/java/refinedstorage/network/MessageRedstoneModeUpdate.java @@ -7,49 +7,42 @@ 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 MessageRedstoneModeUpdate() - { - } - - 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 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)); - - if (tile instanceof IRedstoneModeSetting) - { - IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; - - setting.setRedstoneMode(setting.getRedstoneMode().next()); - } - } +public class MessageRedstoneModeUpdate extends MessageHandlerPlayerToServer implements IMessage { + private int x; + private int y; + private int z; + + public MessageRedstoneModeUpdate() { + } + + 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 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)); + + if (tile instanceof IRedstoneModeSetting) { + IRedstoneModeSetting setting = (IRedstoneModeSetting) tile; + + 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 7dcff78b0f..0896bd4825 --- a/src/main/java/refinedstorage/network/MessageStoragePull.java +++ b/src/main/java/refinedstorage/network/MessageStoragePull.java @@ -9,106 +9,87 @@ 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 915d512d22..7cddb9a0bb --- a/src/main/java/refinedstorage/network/MessageStoragePush.java +++ b/src/main/java/refinedstorage/network/MessageStoragePush.java @@ -8,102 +8,82 @@ 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 10986a3d10..6c9dbfa5ac --- 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.MessageContext; import refinedstorage.tile.INetworkTile; -public class MessageTileUpdate implements IMessage, IMessageHandler -{ - private TileEntity tile; - private int x; - private int y; - private int z; - - public MessageTileUpdate() - { - } - - public MessageTileUpdate(TileEntity tile) - { - this.tile = tile; - } - - @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 (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()); - - if (tile instanceof INetworkTile) - { - ((INetworkTile) tile).toBytes(buf); - } - } - - @Override - public IMessage onMessage(MessageTileUpdate message, MessageContext ctx) - { - return null; - } +public class MessageTileUpdate implements IMessage, IMessageHandler { + private TileEntity tile; + private int x; + private int y; + private int z; + + public MessageTileUpdate() { + } + + public MessageTileUpdate(TileEntity tile) { + this.tile = tile; + } + + @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 (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()); + + if (tile instanceof INetworkTile) { + ((INetworkTile) tile).toBytes(buf); + } + } + + @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 39eb1f533f..4835bd6956 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -11,126 +11,121 @@ 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); - - // 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.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.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")); - - 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.SILICON, 0, new ModelResourceLocation("refinedstorage:silicon", "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.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"); - } - } - }); - - // 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.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")); - } +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") + ); + + 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.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") + ); + + // 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.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.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.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"); + } + } + }); + + // 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.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 475d88ad10..98a1ebd745 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -12,7 +12,9 @@ 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.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); - - 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.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"); - - // 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)); - - // 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) - ); - - // 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) - ); - - // 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) - ); - - // 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) - ); - - // 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) - ); - - // 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()); - - // 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 - 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) - ); - - // 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) - ); - - // 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) - ); - - // 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) - ); - - 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_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) - ); - - 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_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)); - - // Interface - SoldererRegistry.addRecipe(new SoldererRecipeInterface()); - } - - public void init(FMLInitializationEvent e) - { - } - - public void postInit(FMLPostInitializationEvent e) - { - } +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()); + + 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.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)); + + 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); + + // 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) + ); + + // 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) + ); + + // 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) + ); + + // 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()); + + // 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) + ); + + // 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), + " 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)); + + // 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) + ); + + // 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) + ); + + // 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) + ); + + // 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_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) + ); + + // 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_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) + ); + + // 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()); + } + + public void init(FMLInitializationEvent 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 f1494c7227..ba894b9813 --- 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 6d8e2d67e9..90f8ae80ac --- a/src/main/java/refinedstorage/storage/CellStorage.java +++ b/src/main/java/refinedstorage/storage/CellStorage.java @@ -5,44 +5,38 @@ import refinedstorage.tile.TileDrive; import refinedstorage.tile.settings.ModeSettingUtils; -public class CellStorage extends NBTStorage -{ - private TileDrive drive; - - public CellStorage(ItemStack cell, TileDrive drive) - { - super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); - - this.drive = drive; - } - - @Override - public boolean canPush(ItemStack stack) - { - if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) - { - return super.canPush(stack); - } - - 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; - } - - return 0; - } +public class CellStorage extends NBTStorage { + private TileDrive drive; + + public CellStorage(ItemStack cell, TileDrive drive) { + super(cell.getTagCompound(), getCapacity(cell), drive.getPriority()); + + this.drive = drive; + } + + @Override + public boolean canPush(ItemStack stack) { + if (ModeSettingUtils.doesNotViolateMode(drive.getInventory(), drive.getModeSetting(), drive.getCompare(), stack)) { + return super.canPush(stack); + } + + 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; + } + + 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 43459e1f07..ef06413d4f --- 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 interface IStorage { + public void addItems(List items); - public void push(ItemStack stack); + public void push(ItemStack stack); - public ItemStack take(ItemStack stack, int flags); + public ItemStack take(ItemStack stack, int flags); - public boolean canPush(ItemStack stack); + public boolean canPush(ItemStack stack); - public int getPriority(); + 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 dcc4ab86e9..adac2c2206 --- a/src/main/java/refinedstorage/storage/IStorageGui.java +++ b/src/main/java/refinedstorage/storage/IStorageGui.java @@ -5,23 +5,22 @@ 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 678d7e8238..8debb2a152 --- a/src/main/java/refinedstorage/storage/IStorageProvider.java +++ b/src/main/java/refinedstorage/storage/IStorageProvider.java @@ -2,7 +2,6 @@ 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 e3ad6eb288..4ce2260fb9 --- 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 class NBTStorage implements IStorage { + public static final String NBT_ITEMS = "Items"; + public static final String NBT_STORED = "Stored"; - 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 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"; - private NBTTagCompound nbtTag; - private int capacity; - private int priority; + private NBTTagCompound nbtTag; + private int capacity; + private int priority; - public NBTStorage(NBTTagCompound tag, int capacity, int priority) - { - this.nbtTag = tag; - this.capacity = capacity; - this.priority = priority; - } + public NBTStorage(NBTTagCompound tag, int capacity, int priority) { + this.nbtTag = tag; + this.capacity = capacity; + this.priority = priority; + } - @Override - public void addItems(List items) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + @Override + public void addItems(List items) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - for (int i = 0; i < list.tagCount(); ++i) - { - items.add(createItemFromNBT(list.getCompoundTagAt(i))); - } - } + for (int i = 0; i < list.tagCount(); ++i) { + items.add(createItemFromNBT(list.getCompoundTagAt(i))); + } + } - @Override - public void push(ItemStack stack) - { - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + @Override + public void push(ItemStack stack) { + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) + stack.stackSize); - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - StorageItem item = createItemFromNBT(tag); + StorageItem item = createItemFromNBT(tag); - if (item.compareNoQuantity(stack)) - { - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); + if (item.compareNoQuantity(stack)) { + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() + stack.stackSize); - return; - } - } + return; + } + } - NBTTagCompound tag = new NBTTagCompound(); + NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); - tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); - tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); + tag.setInteger(NBT_ITEM_TYPE, Item.getIdFromItem(stack.getItem())); + tag.setInteger(NBT_ITEM_QUANTITY, stack.stackSize); + tag.setInteger(NBT_ITEM_DAMAGE, stack.getItemDamage()); - if (stack.hasTagCompound()) - { - tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); - } + if (stack.hasTagCompound()) { + tag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); + } - list.appendTag(tag); - } + list.appendTag(tag); + } - @Override - public ItemStack take(ItemStack stack, int flags) - { - int quantity = stack.stackSize; + @Override + public ItemStack take(ItemStack stack, int flags) { + int quantity = stack.stackSize; - NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); + NBTTagList list = (NBTTagList) nbtTag.getTag(NBT_ITEMS); - for (int i = 0; i < list.tagCount(); ++i) - { - NBTTagCompound tag = list.getCompoundTagAt(i); + for (int i = 0; i < list.tagCount(); ++i) { + NBTTagCompound tag = list.getCompoundTagAt(i); - StorageItem item = createItemFromNBT(tag); + StorageItem item = createItemFromNBT(tag); - if (item.compare(stack, flags)) - { - if (quantity > item.getQuantity()) - { - quantity = item.getQuantity(); - } + if (item.compare(stack, flags)) { + if (quantity > item.getQuantity()) { + quantity = item.getQuantity(); + } - tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); + tag.setInteger(NBT_ITEM_QUANTITY, item.getQuantity() - quantity); - if (item.getQuantity() - quantity == 0) - { - list.removeTag(i); - } + if (item.getQuantity() - quantity == 0) { + list.removeTag(i); + } - nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); + nbtTag.setInteger(NBT_STORED, getStored(nbtTag) - quantity); - ItemStack newItem = item.toItemStack(); + ItemStack newItem = item.toItemStack(); - newItem.stackSize = quantity; + newItem.stackSize = quantity; - return newItem; - } - } + return newItem; + } + } - return null; - } + return null; + } - @Override - public boolean canPush(ItemStack stack) - { - if (capacity == -1) - { - return true; - } + @Override + public boolean canPush(ItemStack stack) { + if (capacity == -1) { + return true; + } - return (getStored(nbtTag) + stack.stackSize) <= capacity; - } + return (getStored(nbtTag) + stack.stackSize) <= capacity; + } - @Override - public int getPriority() - { - return priority; - } + @Override + public int getPriority() { + return priority; + } - 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); - } + 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 int getStored(NBTTagCompound tag) - { - return tag.getInteger(NBT_STORED); - } + public static int getStored(NBTTagCompound tag) { + return tag.getInteger(NBT_STORED); + } - public static NBTTagCompound getBaseNBT() - { - NBTTagCompound tag = new NBTTagCompound(); + public static NBTTagCompound getBaseNBT() { + NBTTagCompound tag = new NBTTagCompound(); - tag.setTag(NBT_ITEMS, new NBTTagList()); - tag.setInteger(NBT_STORED, 0); + tag.setTag(NBT_ITEMS, new NBTTagList()); + tag.setInteger(NBT_STORED, 0); - return tag; - } + return tag; + } - public static ItemStack initNBT(ItemStack stack) - { - stack.setTagCompound(NBTStorage.getBaseNBT()); + public static ItemStack initNBT(ItemStack stack) { + stack.setTagCompound(NBTStorage.getBaseNBT()); - return stack; - } + 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 3f0ff9b737..956773032f --- 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.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 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, int id) - { - this(type, quantity, damage, tag); - - this.id = id; - } - - 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); - - if (tag != null) - { - ByteBufUtils.writeTag(buf, tag); - } - } - - public Item getType() - { - return type; - } - - public int getQuantity() - { - return quantity; - } - - public void setQuantity(int quantity) - { - this.quantity = quantity; - } - - public int getDamage() - { - return damage; - } - - public void setDamage(int damage) - { - this.damage = damage; - } - - public NBTTagCompound getTag() - { - return tag; - } - - public void setTag(NBTTagCompound tag) - { - this.tag = tag; - } - - @SideOnly(Side.CLIENT) - public int getId() - { - return id; - } - - public StorageItem copy() - { - return copy(quantity); - } - - public StorageItem copy(int newQuantity) - { - return new StorageItem(type, newQuantity, damage, tag); - } - - public ItemStack toItemStack() - { - ItemStack stack = new ItemStack(type, quantity, damage); - - stack.setTagCompound(tag); - - return stack; - } - - 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 (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; - } - } - - 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; - } - } - - 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 ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) - { - if (quantity != stack.stackSize) - { - return false; - } - } - - return type == stack.getItem(); - } - - 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 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(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); + + this.id = id; + } + + 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); + + if (tag != null) { + ByteBufUtils.writeTag(buf, tag); + } + } + + public Item getType() { + return type; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public int getDamage() { + return damage; + } + + public void setDamage(int damage) { + this.damage = damage; + } + + public NBTTagCompound getTag() { + return tag; + } + + public void setTag(NBTTagCompound tag) { + this.tag = tag; + } + + @SideOnly(Side.CLIENT) + public int getId() { + return id; + } + + public StorageItem copy() { + return copy(quantity); + } + + public StorageItem copy(int newQuantity) { + return new StorageItem(type, newQuantity, damage, tag); + } + + public ItemStack toItemStack() { + ItemStack stack = new ItemStack(type, quantity, damage); + + stack.setTagCompound(tag); + + return stack; + } + + 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 (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; + } + } + + 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; + } + } + + 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 ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if (quantity != stack.stackSize) { + return false; + } + } + + return type == stack.getItem(); + } + + 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); + } } 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 6773230c0b..4363703d27 --- a/src/main/java/refinedstorage/tile/INetworkTile.java +++ b/src/main/java/refinedstorage/tile/INetworkTile.java @@ -3,11 +3,10 @@ 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 d55a17a04d..e5e153ea59 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -15,82 +15,70 @@ import refinedstorage.RefinedStorage; import refinedstorage.network.MessageTileUpdate; -public abstract class TileBase extends TileEntity implements ITickable -{ - public static final String NBT_DIRECTION = "Direction"; - - public static final int UPDATE_RANGE = 256; - - private EnumFacing direction = EnumFacing.NORTH; - - protected int 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); - - RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); - } - } - } - - public void setDirection(EnumFacing direction) - { - this.direction = direction; - } - - public EnumFacing getDirection() - { - return direction; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - } - - @Override - public Packet getDescriptionPacket() - { - NBTTagCompound nbt = new NBTTagCompound(); - - nbt.setInteger(NBT_DIRECTION, direction.ordinal()); - - return new SPacketUpdateTileEntity(pos, 1, nbt); - } - - @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(); - } - - public IInventory getDroppedInventory() - { - return null; - } +public abstract class TileBase extends TileEntity implements ITickable { + public static final String NBT_DIRECTION = "Direction"; + + public static final int UPDATE_RANGE = 256; + + private EnumFacing direction = EnumFacing.NORTH; + + protected int 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); + + RefinedStorage.NETWORK.sendToAllAround(new MessageTileUpdate(this), target); + } + } + } + + public void setDirection(EnumFacing direction) { + this.direction = direction; + } + + public EnumFacing getDirection() { + return direction; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION)); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + } + + @Override + public Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); + + nbt.setInteger(NBT_DIRECTION, direction.ordinal()); + + return new SPacketUpdateTileEntity(pos, 1, nbt); + } + + @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(); + } + + 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 839e1e6a34..6bdbd3e9f4 --- 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; + +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; - } + 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; - } - } + public void addMachines(List visited, List machines, TileController controller) { + for (BlockPos visitedBlock : visited) { + if (visitedBlock.equals(pos)) { + return; + } + } - visited.add(pos); + visited.add(pos); - for (EnumFacing dir : EnumFacing.VALUES) - { - BlockPos newPos = pos.offset(dir); + for (EnumFacing dir : EnumFacing.VALUES) { + BlockPos newPos = pos.offset(dir); - boolean alreadyVisited = false; + boolean alreadyVisited = false; - for (BlockPos visitedBlock : visited) - { - if (visitedBlock.equals(newPos)) - { - alreadyVisited = true; - } - } + for (BlockPos visitedBlock : visited) { + if (visitedBlock.equals(newPos)) { + alreadyVisited = true; + } + } - if (alreadyVisited) - { - continue; - } + if (alreadyVisited) { + continue; + } - TileEntity tile = worldObj.getTileEntity(newPos); + TileEntity tile = worldObj.getTileEntity(newPos); - if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) - { - machines.add((TileMachine) tile); + if (tile instanceof TileMachine && ((TileMachine) tile).getRedstoneMode().isEnabled(worldObj, newPos)) { + machines.add((TileMachine) tile); - visited.add(newPos); + visited.add(newPos); - if (tile instanceof TileRelay) - { - for (EnumFacing relayDir : EnumFacing.VALUES) - { - TileEntity nextToRelay = worldObj.getTileEntity(newPos.offset(relayDir)); + 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); - } - } - } + 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 9ba0590dcd..eb69f69ed2 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -10,94 +10,80 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileConstructor extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; - - private InventorySimple inventory = new InventorySimple("constructor", 1, this); - - private int compare = 0; - - @Override - public int getEnergyUsage() - { - return 1; - } - - @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 (took != null) - { - worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); - } - } - } - } - - @Override - public int getCompare() - { - return compare; - } - - @Override - public void setCompare(int compare) - { - markDirty(); - - this.compare = compare; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - - InventoryUtils.restoreInventory(inventory, 0, nbt); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - nbt.setInteger(NBT_COMPARE, compare); - - InventoryUtils.saveInventory(inventory, 0, nbt); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - compare = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(compare); - } - - public IInventory getInventory() - { - return inventory; - } +public class TileConstructor extends TileMachine implements ICompareSetting { + public static final String NBT_COMPARE = "Compare"; + + private InventorySimple inventory = new InventorySimple("constructor", 1, this); + + private int compare = 0; + + @Override + public int getEnergyUsage() { + return 1; + } + + @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 (took != null) { + worldObj.setBlockState(front, ((ItemBlock) took.getItem()).getBlock().getStateFromMeta(took.getItemDamage()), 1 | 2); + } + } + } + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + InventoryUtils.restoreInventory(inventory, 0, nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(NBT_COMPARE, compare); + + InventoryUtils.saveInventory(inventory, 0, nbt); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + } + + 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 c7e297c482..051f98f251 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -3,9 +3,6 @@ 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.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(); + + 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); + + 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)); + } - energy.writeToNBT(nbt); - - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } + machines.clear(); - @Override - public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) - { - return energy.receiveEnergy(maxReceive, simulate); - } + size = buf.readInt(); - @Override - public int getEnergyStored(EnumFacing from) - { - return energy.getEnergyStored(); - } + for (int i = 0; i < size; ++i) { + TileEntity tile = worldObj.getTileEntity(new BlockPos(buf.readInt(), buf.readInt(), buf.readInt())); - public int getEnergyScaled(int i) - { - return (int) ((float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored() * (float) i); - } + if (tile instanceof TileMachine) { + machines.add((TileMachine) tile); + } + } - @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()); + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(energy.getEnergyStored()); + buf.writeInt(isActive() ? energyUsage : 0); - 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(redstoneMode.id); - - buf.writeInt(items.size()); + buf.writeInt(items.size()); - for (StorageItem item : items) - { - item.toBytes(buf, items.indexOf(item)); - } + for (StorageItem item : items) { + item.toBytes(buf, items.indexOf(item)); + } - buf.writeInt(machines.size()); + buf.writeInt(machines.size()); - for (TileMachine machine : machines) - { - buf.writeInt(machine.getPos().getX()); - buf.writeInt(machine.getPos().getY()); - buf.writeInt(machine.getPos().getZ()); - } - } + 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 a9ec2a100d..9689684851 --- 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; - } - - @Override - public void updateMachine() - { - if (ticks % 10 == 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); - - worldObj.setBlockToAir(front); - - for (ItemStack drop : drops) - { - if (!getController().push(drop)) - { - InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); - } - } - } - } - } +import java.util.List; + +public class TileDestructor extends TileMachine { + @Override + public int getEnergyUsage() { + return 1; + } + + @Override + public void updateMachine() { + if (ticks % 10 == 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); + + 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 3165632893..cb725c1b2e --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -10,217 +10,182 @@ 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 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 int compare = 0; - private int mode = MODE_EQUAL; - private int amount = 0; - - private boolean powered = false; - - public TileDetector() - { - this.redstoneControlled = false; - } - - @Override - public void onDisconnected() - { - super.onDisconnected(); - - powered = false; - } - - @Override - public int getEnergyUsage() - { - return 3; - } - - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(0); - - boolean lastPowered = powered; - - if (slot != null) - { - boolean foundAny = false; - - 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; - } - - 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 (powered != lastPowered) - { - worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); - } - } - } - - public boolean isPowered() - { - return powered; - } - - @Override - public int getCompare() - { - return compare; - } - - @Override - public void setCompare(int compare) - { - markDirty(); - - this.compare = compare; - } - - public int getMode() - { - return mode; - } - - public void setMode(int mode) - { - markDirty(); - - this.mode = mode; - } - - public int getAmount() - { - return amount; - } - - public void setAmount(int amount) - { - markDirty(); - - this.amount = amount; - } - - @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); - } - - if (nbt.hasKey(NBT_AMOUNT)) - { - amount = nbt.getInteger(NBT_AMOUNT); - } - - InventoryUtils.restoreInventory(inventory, 0, 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); - - InventoryUtils.saveInventory(inventory, 0, nbt); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - compare = buf.readInt(); - mode = buf.readInt(); - amount = buf.readInt(); - - boolean lastPowered = powered; - - powered = buf.readBoolean(); - - if (powered != lastPowered) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(compare); - buf.writeInt(mode); - buf.writeInt(amount); - buf.writeBoolean(powered); - } - - public IInventory getInventory() - { - return inventory; - } +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"; + + private InventorySimple inventory = new InventorySimple("detector", 1, this); + + private int compare = 0; + private int mode = MODE_EQUAL; + private int amount = 0; + + private boolean powered = false; + + public TileDetector() { + this.redstoneControlled = false; + } + + @Override + public void onDisconnected() { + super.onDisconnected(); + + powered = false; + } + + @Override + public int getEnergyUsage() { + return 3; + } + + @Override + public void updateMachine() { + if (ticks % 5 == 0) { + ItemStack slot = inventory.getStackInSlot(0); + + boolean lastPowered = powered; + + if (slot != null) { + boolean foundAny = false; + + 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; + } + + 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 (powered != lastPowered) { + worldObj.notifyNeighborsOfStateChange(pos, RefinedStorageBlocks.DETECTOR); + } + } + } + + public boolean isPowered() { + return powered; + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + public int getMode() { + return mode; + } + + public void setMode(int mode) { + markDirty(); + + this.mode = mode; + } + + public int getAmount() { + return amount; + } + + public void setAmount(int amount) { + markDirty(); + + this.amount = amount; + } + + @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); + } + + if (nbt.hasKey(NBT_AMOUNT)) { + amount = nbt.getInteger(NBT_AMOUNT); + } + + InventoryUtils.restoreInventory(inventory, 0, 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); + + InventoryUtils.saveInventory(inventory, 0, nbt); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + mode = buf.readInt(); + amount = buf.readInt(); + + boolean lastPowered = powered; + + powered = buf.readBoolean(); + + if (powered != lastPowered) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + buf.writeInt(mode); + buf.writeInt(amount); + buf.writeBoolean(powered); + } + + 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 61d8921b83..66092166d5 --- 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 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"; - - private InventorySimple filterInventory = new InventorySimple("filters", 9, this); - private InventorySimple inventory = new InventorySimple("drive", 8, 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 CellStorage(getStackInSlot(i), this)); - } - } - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(filterInventory, 0, nbt); - InventoryUtils.restoreInventory(inventory, 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(filterInventory, 0, nbt); - InventoryUtils.saveInventory(inventory, 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 cellCapacity = CellStorage.getCapacity(stack); - - if (cellCapacity == -1) - { - return -1; - } - - capacity += cellCapacity; - } - } - - 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; - } +import java.util.List; + +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 InventorySimple filterInventory = new InventorySimple("filters", 9, this); + private InventorySimple inventory = new InventorySimple("drive", 8, 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 CellStorage(getStackInSlot(i), this)); + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(filterInventory, 0, nbt); + InventoryUtils.restoreInventory(inventory, 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(filterInventory, 0, nbt); + InventoryUtils.saveInventory(inventory, 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 cellCapacity = CellStorage.getCapacity(stack); + + if (cellCapacity == -1) { + return -1; + } + + capacity += cellCapacity; + } + } + + 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/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java old mode 100644 new mode 100755 index 11282380a7..208e1b05b8 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -10,138 +10,114 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileExporter extends TileMachine implements ICompareSetting -{ - public static final String NBT_COMPARE = "Compare"; - - private InventorySimple inventory = new InventorySimple("exporter", 9, this); - - private int compare = 0; - - @Override - public int getEnergyUsage() - { - return 2; - } - - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - - 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 (slot != null) - { - ItemStack toTake = slot.copy(); - - toTake.stackSize = 64; - - ItemStack took = getController().take(toTake, compare); - - if (took != null) - { - if (connectedInventory instanceof ISidedInventory) - { - ISidedInventory sided = (ISidedInventory) connectedInventory; - - 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); - } - } - } - } - } - } - } - - @Override - public int getCompare() - { - return compare; - } - - @Override - public void setCompare(int compare) - { - markDirty(); - - this.compare = compare; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - - InventoryUtils.restoreInventory(inventory, 0, nbt); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - nbt.setInteger(NBT_COMPARE, compare); - - InventoryUtils.saveInventory(inventory, 0, nbt); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - compare = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(compare); - } - - public IInventory getInventory() - { - return inventory; - } +public class TileExporter extends TileMachine implements ICompareSetting { + public static final String NBT_COMPARE = "Compare"; + + private InventorySimple inventory = new InventorySimple("exporter", 9, this); + + private int compare = 0; + + @Override + public int getEnergyUsage() { + return 2; + } + + @Override + public void updateMachine() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + + 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 (slot != null) { + ItemStack toTake = slot.copy(); + + toTake.stackSize = 64; + + ItemStack took = getController().take(toTake, compare); + + if (took != null) { + if (connectedInventory instanceof ISidedInventory) { + ISidedInventory sided = (ISidedInventory) connectedInventory; + + 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); + } + } + } + } + } + } + } + + @Override + public int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + this.compare = compare; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + + InventoryUtils.restoreInventory(inventory, 0, nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(NBT_COMPARE, compare); + + InventoryUtils.saveInventory(inventory, 0, nbt); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + } + + 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 6f3e703bc4..7342f0441b --- 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.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"; - - private InventorySimple inventory = new InventorySimple("external_storage", 9, this); - - private int priority = 0; - private int compare = 0; - private int mode = 0; - - @SideOnly(Side.CLIENT) - private int stored = 0; - - @Override - public int getEnergyUsage() - { - return 2; - } - - @Override - public void updateMachine() - { - } - - @Override - public void addItems(List items) - { - 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))); - } - } - } - } - - @Override - public void push(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); - - if (connectedInventory == null) - { - return; - } - - InventoryUtils.pushToInventory(connectedInventory, stack); - } - - @Override - public ItemStack take(ItemStack stack, int flags) - { - IInventory connectedInventory = getConnectedInventory(); - - if (connectedInventory == null) - { - return null; - } - - int quantity = stack.stackSize; - - for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) - { - ItemStack slot = connectedInventory.getStackInSlot(i); - - if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) - { - if (quantity > slot.stackSize) - { - quantity = slot.stackSize; - } - - slot.stackSize -= quantity; - - if (slot.stackSize == 0) - { - connectedInventory.setInventorySlotContents(i, null); - } - - ItemStack newItem = slot.copy(); - - newItem.stackSize = quantity; - - return newItem; - } - } - - return null; - } - - @Override - public boolean canPush(ItemStack stack) - { - IInventory connectedInventory = getConnectedInventory(); - - if (connectedInventory == null) - { - return false; - } - - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); - } - - public IInventory getConnectedInventory() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - - if (tile instanceof IInventory) - { - return (IInventory) tile; - } - - return null; - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(priority); - buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); - buf.writeInt(compare); - buf.writeInt(mode); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - priority = buf.readInt(); - stored = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(inventory, 0, 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); - - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } - - @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 int getPriority() - { - return priority; - } - - public void setPriority(int priority) - { - markDirty(); - - this.priority = priority; - } - - @Override - public void addStorages(List storages) - { - storages.add(this); - } - - @Override - public String getName() - { - return "gui.refinedstorage:external_storage"; - } - - @Override - public IRedstoneModeSetting getRedstoneModeSetting() - { - return this; - } - - @Override - public ICompareSetting getCompareSetting() - { - return this; - } - - @Override - public IModeSetting getModeSetting() - { - return this; - } - - @Override - public int getStored() - { - return stored; - } - - @Override - public int getCapacity() - { - if (getConnectedInventory() == null) - { - return 0; - } - - return getConnectedInventory().getSizeInventory() * 64; - } - - @Override - public void onPriorityChanged(int priority) - { - RefinedStorage.NETWORK.sendToServer(new MessagePriorityUpdate(pos, priority)); - } - - @Override - public IInventory getInventory() - { - return inventory; - } +import java.util.List; + +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 InventorySimple inventory = new InventorySimple("external_storage", 9, this); + + private int priority = 0; + private int compare = 0; + private int mode = 0; + + @SideOnly(Side.CLIENT) + private int stored = 0; + + @Override + public int getEnergyUsage() { + return 2; + } + + @Override + public void updateMachine() { + } + + @Override + public void addItems(List items) { + 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))); + } + } + } + } + + @Override + public void push(ItemStack stack) { + IInventory connectedInventory = getConnectedInventory(); + + if (connectedInventory == null) { + return; + } + + InventoryUtils.pushToInventory(connectedInventory, stack); + } + + @Override + public ItemStack take(ItemStack stack, int flags) { + IInventory connectedInventory = getConnectedInventory(); + + if (connectedInventory == null) { + return null; + } + + int quantity = stack.stackSize; + + for (int i = 0; i < connectedInventory.getSizeInventory(); ++i) { + ItemStack slot = connectedInventory.getStackInSlot(i); + + if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { + if (quantity > slot.stackSize) { + quantity = slot.stackSize; + } + + slot.stackSize -= quantity; + + if (slot.stackSize == 0) { + connectedInventory.setInventorySlotContents(i, null); + } + + ItemStack newItem = slot.copy(); + + newItem.stackSize = quantity; + + return newItem; + } + } + + return null; + } + + @Override + public boolean canPush(ItemStack stack) { + IInventory connectedInventory = getConnectedInventory(); + + if (connectedInventory == null) { + return false; + } + + return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && InventoryUtils.canPushToInventory(connectedInventory, stack); + } + + public IInventory getConnectedInventory() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + + if (tile instanceof IInventory) { + return (IInventory) tile; + } + + return null; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(priority); + buf.writeInt(getConnectedInventory() == null ? 0 : InventoryUtils.getInventoryItems(getConnectedInventory())); + buf.writeInt(compare); + buf.writeInt(mode); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + priority = buf.readInt(); + stored = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(inventory, 0, 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); + + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } + + @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 int getPriority() { + return priority; + } + + public void setPriority(int priority) { + markDirty(); + + this.priority = priority; + } + + @Override + public void addStorages(List storages) { + storages.add(this); + } + + @Override + public String getName() { + return "gui.refinedstorage:external_storage"; + } + + @Override + public IRedstoneModeSetting getRedstoneModeSetting() { + return this; + } + + @Override + public ICompareSetting getCompareSetting() { + return this; + } + + @Override + public IModeSetting getModeSetting() { + return this; + } + + @Override + public int getStored() { + return stored; + } + + @Override + public int getCapacity() { + if (getConnectedInventory() == null) { + return 0; + } + + return getConnectedInventory().getSizeInventory() * 64; + } + + @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 7b67098eb6..f2de01a0e0 --- a/src/main/java/refinedstorage/tile/TileGrid.java +++ b/src/main/java/refinedstorage/tile/TileGrid.java @@ -18,184 +18,155 @@ 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 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; - - 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); - - private int sortingDirection = 0; - private int sortingType = 0; - - @Override - public int getEnergyUsage() - { - return 4; - } - - @Override - public void updateMachine() - { - } - - public EnumGridType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) - { - return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); - } - - return EnumGridType.NORMAL; - } - - public InventoryCrafting getCraftingInventory() - { - return craftingInventory; - } - - public InventorySimple getCraftingResultInventory() - { - return craftingResultInventory; - } - - public void onCraftingMatrixChanged() - { - markDirty(); - - 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); - - 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; - } - } - } - } - - onCraftingMatrixChanged(); - - TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); - - RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); - } - } - - public int getSortingDirection() - { - return sortingDirection; - } - - public void setSortingDirection(int sortingDirection) - { - markDirty(); - - this.sortingDirection = sortingDirection; - } - - public int getSortingType() - { - return sortingType; - } - - public void setSortingType(int sortingType) - { - markDirty(); - - this.sortingType = sortingType; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(craftingInventory, 0, nbt); - - if (nbt.hasKey(NBT_SORTING_DIRECTION)) - { - sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); - } - - if (nbt.hasKey(NBT_SORTING_TYPE)) - { - sortingType = nbt.getInteger(NBT_SORTING_TYPE); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(craftingInventory, 0, nbt); - - nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); - nbt.setInteger(NBT_SORTING_TYPE, sortingType); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(sortingDirection); - buf.writeInt(sortingType); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - sortingDirection = buf.readInt(); - sortingType = buf.readInt(); - } - - @Override - public IInventory getDroppedInventory() - { - if (getType() == EnumGridType.CRAFTING) - { - return craftingInventory; - } - - return null; - } +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_TYPE_QUANTITY = 0; + public static final int SORTING_TYPE_NAME = 1; + + 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); + + private int sortingDirection = 0; + private int sortingType = 0; + + @Override + public int getEnergyUsage() { + return 4; + } + + @Override + public void updateMachine() { + } + + public EnumGridType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.GRID) { + return (EnumGridType) worldObj.getBlockState(pos).getValue(BlockGrid.TYPE); + } + + return EnumGridType.NORMAL; + } + + public InventoryCrafting getCraftingInventory() { + return craftingInventory; + } + + public InventorySimple getCraftingResultInventory() { + return craftingResultInventory; + } + + public void onCraftingMatrixChanged() { + markDirty(); + + 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); + + 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; + } + } + } + } + + onCraftingMatrixChanged(); + + TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE); + + RefinedStorage.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target); + } + } + + public int getSortingDirection() { + return sortingDirection; + } + + public void setSortingDirection(int sortingDirection) { + markDirty(); + + this.sortingDirection = sortingDirection; + } + + public int getSortingType() { + return sortingType; + } + + public void setSortingType(int sortingType) { + markDirty(); + + this.sortingType = sortingType; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(craftingInventory, 0, nbt); + + if (nbt.hasKey(NBT_SORTING_DIRECTION)) { + sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); + } + + if (nbt.hasKey(NBT_SORTING_TYPE)) { + sortingType = nbt.getInteger(NBT_SORTING_TYPE); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + InventoryUtils.saveInventory(craftingInventory, 0, nbt); + + nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); + nbt.setInteger(NBT_SORTING_TYPE, sortingType); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(sortingDirection); + buf.writeInt(sortingType); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + sortingDirection = buf.readInt(); + sortingType = buf.readInt(); + } + + @Override + public IInventory getDroppedInventory() { + if (getType() == EnumGridType.CRAFTING) { + return craftingInventory; + } + + 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 4f42538b48..9348bf5dee --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -11,204 +11,169 @@ 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"; - - private InventorySimple inventory = new InventorySimple("importer", 9, this); - - private int compare = 0; - private int mode = 0; - - private int currentSlot = 0; - - @Override - public int getEnergyUsage() - { - return 2; - } - - @Override - public void updateMachine() - { - TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); - - if (tile instanceof IInventory) - { - IInventory connectedInventory = (IInventory) tile; - - if (ticks % 5 == 0) - { - ItemStack slot = connectedInventory.getStackInSlot(currentSlot); - - while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; - - 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); - } - } - } - else if (getController().push(slot.copy())) - { - connectedInventory.setInventorySlotContents(currentSlot, null); - } - - connectedInventory.markDirty(); - } - - currentSlot++; - - if (currentSlot > connectedInventory.getSizeInventory() - 1) - { - currentSlot = 0; - } - } - } - } - - public boolean canImport(ItemStack stack) - { - int slots = 0; - - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); - - if (slot != null) - { - slots++; - - if (InventoryUtils.compareStack(stack, slot, compare)) - { - if (isWhitelist()) - { - return true; - } - else if (isBlacklist()) - { - return false; - } - } - } - } - - if (isWhitelist()) - { - return slots == 0; - } - - return true; - } - - @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; - } +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 int compare = 0; + private int mode = 0; + + private int currentSlot = 0; + + @Override + public int getEnergyUsage() { + return 2; + } + + @Override + public void updateMachine() { + TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection())); + + if (tile instanceof IInventory) { + IInventory connectedInventory = (IInventory) tile; + + if (ticks % 5 == 0) { + ItemStack slot = connectedInventory.getStackInSlot(currentSlot); + + while ((slot = connectedInventory.getStackInSlot(currentSlot)) == null) { + currentSlot++; + + 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); + } + } + } else if (getController().push(slot.copy())) { + connectedInventory.setInventorySlotContents(currentSlot, null); + } + + connectedInventory.markDirty(); + } + + currentSlot++; + + if (currentSlot > connectedInventory.getSizeInventory() - 1) { + currentSlot = 0; + } + } + } + } + + public boolean canImport(ItemStack stack) { + int slots = 0; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); + + if (slot != null) { + slots++; + + if (InventoryUtils.compareStack(stack, slot, compare)) { + if (isWhitelist()) { + return true; + } else if (isBlacklist()) { + return false; + } + } + } + } + + if (isWhitelist()) { + return slots == 0; + } + + return true; + } + + @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/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java old mode 100644 new mode 100755 index bf0158de22..a7a45caca6 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -12,311 +12,255 @@ import refinedstorage.tile.settings.ICompareSetting; import refinedstorage.util.InventoryUtils; -public class TileInterface extends TileMachine implements ICompareSetting, ISidedInventory -{ - public static final String NBT_COMPARE = "Compare"; - - private InventorySimple inventory = new InventorySimple("interface", 9 * 3); - - private int compare = 0; - - private int currentSlot = 0; - - @Override - public int getEnergyUsage() - { - return 4; - } - - @Override - public void updateMachine() - { - if (ticks % 5 == 0) - { - ItemStack slot = inventory.getStackInSlot(currentSlot); - - while ((slot = inventory.getStackInSlot(currentSlot)) == null) - { - currentSlot++; - - if (currentSlot > 8) - { - break; - } - } - - if (inventory.getStackInSlot(currentSlot) != null) - { - if (getController().push(slot)) - { - inventory.setInventorySlotContents(currentSlot, null); - } - } - - currentSlot++; - - if (currentSlot > 8) - { - currentSlot = 0; - } - } - - 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 (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); - - int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; - - ItemStack goingToTake = wanted.copy(); - goingToTake.stackSize = needed; - - 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); - } - } - } - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(this, 0, nbt); - - if (nbt.hasKey(NBT_COMPARE)) - { - compare = nbt.getInteger(NBT_COMPARE); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - InventoryUtils.saveInventory(this, 0, nbt); - - nbt.setInteger(NBT_COMPARE, compare); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - compare = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(compare); - } - - @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 String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public IInventory getDroppedInventory() - { - InventorySimple dummy = new InventorySimple("dummy", 9); - - for (int i = 0; i < 9; ++i) - { - dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); - } - - return dummy; - } - - @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 - }; - } - - @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 int getCompare() - { - return compare; - } - - @Override - public void setCompare(int compare) - { - markDirty(); - - this.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 int compare = 0; + + private int currentSlot = 0; + + @Override + public int getEnergyUsage() { + return 4; + } + + @Override + public void updateMachine() { + if (ticks % 5 == 0) { + ItemStack slot = inventory.getStackInSlot(currentSlot); + + while ((slot = inventory.getStackInSlot(currentSlot)) == null) { + currentSlot++; + + if (currentSlot > 8) { + break; + } + } + + if (inventory.getStackInSlot(currentSlot) != null) { + if (getController().push(slot)) { + inventory.setInventorySlotContents(currentSlot, null); + } + } + + currentSlot++; + + if (currentSlot > 8) { + currentSlot = 0; + } + } + + 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 (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); + + int needed = got == null ? wanted.stackSize : wanted.stackSize - got.stackSize; + + ItemStack goingToTake = wanted.copy(); + goingToTake.stackSize = needed; + + 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); + } + } + } + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(this, 0, nbt); + + if (nbt.hasKey(NBT_COMPARE)) { + compare = nbt.getInteger(NBT_COMPARE); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + InventoryUtils.saveInventory(this, 0, nbt); + + nbt.setInteger(NBT_COMPARE, compare); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + compare = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(compare); + } + + @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 String getName() { + return inventory.getName(); + } + + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } + + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public IInventory getDroppedInventory() { + InventorySimple dummy = new InventorySimple("dummy", 9); + + for (int i = 0; i < 9; ++i) { + dummy.setInventorySlotContents(i, inventory.getStackInSlot(18 + i)); + } + + return dummy; + } + + @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 + }; + } + + @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 int getCompare() { + return compare; + } + + @Override + public void setCompare(int compare) { + markDirty(); + + 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 2a802f960a..e82e6250c8 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -8,153 +8,130 @@ 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; - - protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; - - private BlockPos controllerPosition; - - private Block originalBlock; - - public void onConnected(TileController controller) - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); - - connected = true; - - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); - - controllerPosition = controller.getPos(); - } - } - - public void onDisconnected() - { - if (worldObj.getBlockState(pos).getBlock() == originalBlock) - { - markDirty(); - - connected = false; - - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); - } - } - - @Override - public void update() - { - if (ticks == 0) - { - originalBlock = worldObj.getBlockState(pos).getBlock(); - } - - super.update(); - - if (!worldObj.isRemote && isConnected()) - { - updateMachine(); - } - } - - public boolean isConnected() - { - return connected; - } - - @Override - public RedstoneMode getRedstoneMode() - { - return redstoneMode; - } - - @Override - public void setRedstoneMode(RedstoneMode mode) - { - if (redstoneControlled) - { - markDirty(); - - this.redstoneMode = mode; - } - } - - @Override - public BlockPos getMachinePos() - { - return pos; - } - - @Override - public BlockPos getTilePos() - { - return pos; - } - - public TileController getController() - { - return (TileController) worldObj.getTileEntity(controllerPosition); - } - - @Override - public void fromBytes(ByteBuf buf) - { - boolean lastConnected = connected; - - connected = buf.readBoolean(); - - if (connected) - { - controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); - } - - redstoneMode = RedstoneMode.getById(buf.readInt()); - - if (lastConnected != connected) - { - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); - } - } - - @Override - public void toBytes(ByteBuf buf) - { - buf.writeBoolean(connected); - - if (connected) - { - buf.writeInt(controllerPosition.getX()); - buf.writeInt(controllerPosition.getY()); - buf.writeInt(controllerPosition.getZ()); - } - - buf.writeInt(redstoneMode.id); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - if (nbt.hasKey(RedstoneMode.NBT)) - { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } - - public abstract int getEnergyUsage(); - - public abstract void updateMachine(); +public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting { + protected boolean connected = false; + protected boolean redstoneControlled = true; + + protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; + + private BlockPos controllerPosition; + + private Block originalBlock; + + public void onConnected(TileController controller) { + if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); + + connected = true; + + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, true)); + + controllerPosition = controller.getPos(); + } + } + + public void onDisconnected() { + if (worldObj.getBlockState(pos).getBlock() == originalBlock) { + markDirty(); + + connected = false; + + worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockMachine.CONNECTED, false)); + } + } + + @Override + public void update() { + if (ticks == 0) { + originalBlock = worldObj.getBlockState(pos).getBlock(); + } + + super.update(); + + if (!worldObj.isRemote && isConnected()) { + updateMachine(); + } + } + + public boolean isConnected() { + return connected; + } + + @Override + public RedstoneMode getRedstoneMode() { + return redstoneMode; + } + + @Override + public void setRedstoneMode(RedstoneMode mode) { + if (redstoneControlled) { + markDirty(); + + this.redstoneMode = mode; + } + } + + @Override + public BlockPos getMachinePos() { + return pos; + } + + @Override + public BlockPos getTilePos() { + return pos; + } + + public TileController getController() { + return (TileController) worldObj.getTileEntity(controllerPosition); + } + + @Override + public void fromBytes(ByteBuf buf) { + boolean lastConnected = connected; + + connected = buf.readBoolean(); + + if (connected) { + controllerPosition = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); + } + + redstoneMode = RedstoneMode.getById(buf.readInt()); + + if (lastConnected != connected) { + worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 2 | 4); + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(connected); + + if (connected) { + buf.writeInt(controllerPosition.getX()); + buf.writeInt(controllerPosition.getY()); + buf.writeInt(controllerPosition.getZ()); + } + + buf.writeInt(redstoneMode.id); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey(RedstoneMode.NBT)) { + redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); + } + + public abstract int getEnergyUsage(); + + 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 ed183e83da..572fbf713f --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -2,21 +2,17 @@ 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 59110ab69a..8c67e439ff --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -15,288 +15,243 @@ 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"; - - private InventorySimple inventory = new InventorySimple("solderer", 4); - - private ISoldererRecipe recipe; - - private boolean working = false; - private int progress = 0; - @SideOnly(Side.CLIENT) - private int duration; - - @Override - public int getEnergyUsage() - { - return 3; - } - - @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; - - markDirty(); - } - else if (working) - { - progress++; - - 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); - } - } - - reset(); - } - } - } - - @Override - public void onDisconnected() - { - super.onDisconnected(); - - reset(); - } - - public void reset() - { - progress = 0; - working = false; - recipe = null; - - markDirty(); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(this, 0, nbt); - - recipe = SoldererRegistry.getRecipe(inventory); - - 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); - - working = buf.readBoolean(); - progress = buf.readInt(); - duration = buf.readInt(); - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeBoolean(working); - buf.writeInt(progress); - buf.writeInt(recipe != null ? recipe.getDuration() : 0); - } - - public boolean isWorking() - { - return working; - } - - 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 getDuration() - { - return duration; - } - - @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 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 String getName() - { - return inventory.getName(); - } - - @Override - public boolean hasCustomName() - { - return inventory.hasCustomName(); - } - - @Override - public ITextComponent getDisplayName() - { - return inventory.getDisplayName(); - } - - @Override - public int[] getSlotsForFace(EnumFacing side) - { - if (side != EnumFacing.DOWN) - { - return new int[] - { - 0, 1, 2 - }; - } - - return new int[] - { - 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; - } +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 ISoldererRecipe recipe; + + private boolean working = false; + private int progress = 0; + @SideOnly(Side.CLIENT) + private int duration; + + @Override + public int getEnergyUsage() { + return 3; + } + + @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; + + markDirty(); + } else if (working) { + progress++; + + 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); + } + } + + reset(); + } + } + } + + @Override + public void onDisconnected() { + super.onDisconnected(); + + reset(); + } + + public void reset() { + progress = 0; + working = false; + recipe = null; + + markDirty(); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(this, 0, nbt); + + recipe = SoldererRegistry.getRecipe(inventory); + + 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); + + working = buf.readBoolean(); + progress = buf.readInt(); + duration = buf.readInt(); + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeBoolean(working); + buf.writeInt(progress); + buf.writeInt(recipe != null ? recipe.getDuration() : 0); + } + + public boolean isWorking() { + return working; + } + + 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 getDuration() { + return duration; + } + + @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 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 String getName() { + return inventory.getName(); + } + + @Override + public boolean hasCustomName() { + return inventory.hasCustomName(); + } + + @Override + public ITextComponent getDisplayName() { + return inventory.getDisplayName(); + } + + @Override + public int[] getSlotsForFace(EnumFacing side) { + if (side != EnumFacing.DOWN) { + return new int[] + { + 0, 1, 2 + }; + } + + return new int[] + { + 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; + } } 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 771dc0487a..ee20e65f6e --- 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.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"; - - private InventorySimple inventory = new InventorySimple("storage", 9, this); - - private NBTTagCompound tag = NBTStorage.getBaseNBT(); - - private int priority = 0; - private int compare = 0; - private int mode = 0; - - @SideOnly(Side.CLIENT) - private int stored; - - @Override - public int getEnergyUsage() - { - return 3; - } - - @Override - public void updateMachine() - { - } - - @Override - public void addStorages(List storages) - { - storages.add(this); - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - - InventoryUtils.restoreInventory(inventory, 0, nbt); - - if (nbt.hasKey(NBT_STORAGE)) - { - tag = nbt.getCompoundTag(NBT_STORAGE); - } - - 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); - - nbt.setTag(NBT_STORAGE, tag); - nbt.setInteger(NBT_PRIORITY, priority); - nbt.setInteger(NBT_COMPARE, compare); - nbt.setInteger(NBT_MODE, mode); - } - - public EnumStorageType getType() - { - if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) - { - return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); - } - - return EnumStorageType.TYPE_1K; - } - - @Override - public void toBytes(ByteBuf buf) - { - super.toBytes(buf); - - buf.writeInt(NBTStorage.getStored(tag)); - buf.writeInt(priority); - buf.writeInt(compare); - buf.writeInt(mode); - } - - @Override - public void fromBytes(ByteBuf buf) - { - super.fromBytes(buf); - - stored = buf.readInt(); - priority = buf.readInt(); - compare = buf.readInt(); - mode = buf.readInt(); - } - - @Override - public void addItems(List items) - { - getStorage().addItems(items); - - markDirty(); - } - - @Override - public void push(ItemStack stack) - { - getStorage().push(stack); - - markDirty(); - } - - @Override - public ItemStack take(ItemStack stack, int flags) - { - ItemStack result = getStorage().take(stack, flags); - - markDirty(); - - return result; - } - - @Override - public boolean canPush(ItemStack stack) - { - return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); - } - - @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:storage." + getType().getId() + ".name"; - } - - @Override - public IInventory getInventory() - { - return inventory; - } - - @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)); - } - - public NBTStorage getStorage() - { - return new NBTStorage(tag, getCapacity(), priority); - } - - public NBTTagCompound getStorageTag() - { - return tag; - } - - public void setStorageTag(NBTTagCompound tag) - { - markDirty(); - - this.tag = tag; - } - - @Override - public int getPriority() - { - return priority; - } - - public void setPriority(int priority) - { - markDirty(); - - this.priority = priority; - } - - @Override - public int getStored() - { - return stored; - } - - public int getStoredScaled(int scale) - { - if (getType() == EnumStorageType.TYPE_CREATIVE) - { - return 0; - } - - return (int) ((float) getStored() / (float) getCapacity() * (float) scale); - } - - @Override - public int getCapacity() - { - return getType().getCapacity(); - } +import java.util.List; + +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 InventorySimple inventory = new InventorySimple("storage", 9, this); + + private NBTTagCompound tag = NBTStorage.getBaseNBT(); + + private int priority = 0; + private int compare = 0; + private int mode = 0; + + @SideOnly(Side.CLIENT) + private int stored; + + @Override + public int getEnergyUsage() { + return 3; + } + + @Override + public void updateMachine() { + } + + @Override + public void addStorages(List storages) { + storages.add(this); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + InventoryUtils.restoreInventory(inventory, 0, nbt); + + if (nbt.hasKey(NBT_STORAGE)) { + tag = nbt.getCompoundTag(NBT_STORAGE); + } + + 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); + + nbt.setTag(NBT_STORAGE, tag); + nbt.setInteger(NBT_PRIORITY, priority); + nbt.setInteger(NBT_COMPARE, compare); + nbt.setInteger(NBT_MODE, mode); + } + + public EnumStorageType getType() { + if (worldObj.getBlockState(pos).getBlock() == RefinedStorageBlocks.STORAGE) { + return ((EnumStorageType) worldObj.getBlockState(pos).getValue(BlockStorage.TYPE)); + } + + return EnumStorageType.TYPE_1K; + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + + buf.writeInt(NBTStorage.getStored(tag)); + buf.writeInt(priority); + buf.writeInt(compare); + buf.writeInt(mode); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + + stored = buf.readInt(); + priority = buf.readInt(); + compare = buf.readInt(); + mode = buf.readInt(); + } + + @Override + public void addItems(List items) { + getStorage().addItems(items); + + markDirty(); + } + + @Override + public void push(ItemStack stack) { + getStorage().push(stack); + + markDirty(); + } + + @Override + public ItemStack take(ItemStack stack, int flags) { + ItemStack result = getStorage().take(stack, flags); + + markDirty(); + + return result; + } + + @Override + public boolean canPush(ItemStack stack) { + return ModeSettingUtils.doesNotViolateMode(inventory, this, compare, stack) && getStorage().canPush(stack); + } + + @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:storage." + getType().getId() + ".name"; + } + + @Override + public IInventory getInventory() { + return inventory; + } + + @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)); + } + + public NBTStorage getStorage() { + return new NBTStorage(tag, getCapacity(), priority); + } + + public NBTTagCompound getStorageTag() { + return tag; + } + + public void setStorageTag(NBTTagCompound tag) { + markDirty(); + + this.tag = tag; + } + + @Override + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + markDirty(); + + this.priority = priority; + } + + @Override + public int getStored() { + return stored; + } + + public int getStoredScaled(int scale) { + if (getType() == EnumStorageType.TYPE_CREATIVE) { + return 0; + } + + 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 55e0ced12a..82c1a68a56 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -11,267 +11,225 @@ 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); - - 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(); - } +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); + + 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/settings/ICompareSetting.java b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java old mode 100644 new mode 100755 index 1437d068b6..7c9177eec4 --- a/src/main/java/refinedstorage/tile/settings/ICompareSetting.java +++ b/src/main/java/refinedstorage/tile/settings/ICompareSetting.java @@ -2,11 +2,10 @@ 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 75cc34ca30..f708d567c0 --- a/src/main/java/refinedstorage/tile/settings/IModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IModeSetting.java @@ -2,15 +2,14 @@ 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 b774eada55..d7eec13753 --- a/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java +++ b/src/main/java/refinedstorage/tile/settings/IRedstoneModeSetting.java @@ -2,11 +2,10 @@ 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 49a0859152..a1936fcef7 --- 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.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; - - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); - - if (slot != null) - { - slots++; - - 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); - - if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) - { - return false; - } - } - - return true; - } - - return false; - } +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); + + if (slot != null) { + slots++; + + 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); + + if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) { + return false; + } + } + + return true; + } + + 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 3d9bf9556b..c2fdce4681 --- a/src/main/java/refinedstorage/tile/settings/RedstoneMode.java +++ b/src/main/java/refinedstorage/tile/settings/RedstoneMode.java @@ -3,58 +3,49 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public enum RedstoneMode -{ - IGNORE(0), - HIGH(1), - LOW(2); - - public static final String NBT = "RedstoneMode"; - - public final int id; - - RedstoneMode(int id) - { - this.id = id; - } - - public RedstoneMode next() - { - RedstoneMode next = getById(id + 1); - - if (next == null) - { - return getById(0); - } - - 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); - } - - return false; - } - - public static RedstoneMode getById(int id) - { - for (RedstoneMode control : values()) - { - if (control.id == id) - { - return control; - } - } - - return null; - } +public enum RedstoneMode { + IGNORE(0), + HIGH(1), + LOW(2); + + public static final String NBT = "RedstoneMode"; + + public final int id; + + RedstoneMode(int id) { + this.id = id; + } + + public RedstoneMode next() { + RedstoneMode next = getById(id + 1); + + if (next == null) { + return getById(0); + } + + 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); + } + + return false; + } + + public static RedstoneMode getById(int id) { + for (RedstoneMode control : values()) { + if (control.id == id) { + return control; + } + } + + 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 8122c8bd8c..9a1007efd8 --- a/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java +++ b/src/main/java/refinedstorage/tile/solderer/ISoldererRecipe.java @@ -2,11 +2,10 @@ 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 fae2db28e6..6c0317604d --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java @@ -7,36 +7,27 @@ 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 759119e3c8..0e019bd052 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeDrive.java @@ -6,36 +6,27 @@ 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 ec0f42bc7d..c25cb6282d --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java @@ -5,36 +5,27 @@ 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 165dd6af52..31b4d72e87 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipePrintedProcessor.java @@ -5,57 +5,49 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipePrintedProcessor implements ISoldererRecipe -{ - private int 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); - } - } - - return null; - } - - @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; - } - - return 0; - } +public class SoldererRecipePrintedProcessor implements ISoldererRecipe { + private int 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); + } + } + + return null; + } + + @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; + } + + 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 4ec2e21b56..ec4bd99bca --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeProcessor.java @@ -5,61 +5,49 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.item.ItemProcessor; -public class SoldererRecipeProcessor implements ISoldererRecipe -{ - private int 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); - } - - return null; - } - - @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; - } - - return 0; - } +public class SoldererRecipeProcessor implements ISoldererRecipe { + private int 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); + } + + return null; + } + + @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; + } + + 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 ab8562fdb4..4312366c0b --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeStorage.java @@ -7,45 +7,35 @@ 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 6ffd916ff7..300af35299 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRecipeWirelessGrid.java @@ -5,43 +5,33 @@ 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 4855174cd6..79c2cc4d08 --- 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(); - - public static void addRecipe(ISoldererRecipe recipe) - { - recipes.add(recipe); - } - - public static ISoldererRecipe getRecipe(IInventory inventory) - { - for (ISoldererRecipe recipe : recipes) - { - boolean ok = true; - - for (int i = 0; i < 3; ++i) - { - if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) - { - ok = false; - } - - if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) - { - if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) - { - ok = false; - } - } - } - - if (ok) - { - return recipe; - } - } - - return null; - } - - public static ISoldererRecipe getRecipe(ItemStack result) - { - for (ISoldererRecipe recipe : recipes) - { - if (InventoryUtils.compareStack(result, recipe.getResult())) - { - return recipe; - } - } - - return null; - } +import java.util.ArrayList; +import java.util.List; + +public class SoldererRegistry { + public static List recipes = new ArrayList(); + + public static void addRecipe(ISoldererRecipe recipe) { + recipes.add(recipe); + } + + public static ISoldererRecipe getRecipe(IInventory inventory) { + for (ISoldererRecipe recipe : recipes) { + boolean ok = true; + + for (int i = 0; i < 3; ++i) { + if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) { + ok = false; + } + + if (inventory.getStackInSlot(i) != null && recipe.getRow(i) != null) { + if (inventory.getStackInSlot(i).stackSize < recipe.getRow(i).stackSize) { + ok = false; + } + } + } + + if (ok) { + return recipe; + } + } + + 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 f5263cd014..4008b3b9d9 --- a/src/main/java/refinedstorage/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/util/InventoryUtils.java @@ -8,268 +8,218 @@ 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 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(); - - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (inventory.getStackInSlot(i) != null) - { - NBTTagCompound compoundTag = new NBTTagCompound(); - - compoundTag.setInteger(NBT_SLOT, i); - - inventory.getStackInSlot(i).writeToNBT(compoundTag); - - tagList.appendTag(compoundTag); - } - } - - 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); - - 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); - - ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); - - 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); - - 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; - - while (stack.stackSize > 0) - { - int amount = world.rand.nextInt(21) + 10; - - if (amount > stack.stackSize) - { - amount = stack.stackSize; - } - - stack.stackSize -= amount; - - 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; - - if (stack.hasTagCompound()) - { - entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); - } - - world.spawnEntityInWorld(entity); - } - } - - 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; - } - } - - public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) - { - ItemStack slot = inventory.getStackInSlot(i); - - if (slot == null) - { - return true; - } - - if (!compareStackNoQuantity(slot, stack)) - { - return false; - } - - return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); - } - - 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); - - if (slot == null) - { - inventory.setInventorySlotContents(i, stack); - - return; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; - - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } - - slot.stackSize += toAdd; - - toGo -= toAdd; - - if (toGo == 0) - { - return; - } - } - } - } - - 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; - } - - ItemStack slot = inventory.getStackInSlot(i); - - if (slot == null) - { - return true; - } - else if (compareStackNoQuantity(slot, stack)) - { - int toAdd = toGo; - - if (slot.stackSize + toAdd > slot.getMaxStackSize()) - { - toAdd = slot.getMaxStackSize() - slot.stackSize; - } - - toGo -= toAdd; - - if (toGo == 0) - { - break; - } - } - } - - return toGo == 0; - } - - public static int getInventoryItems(IInventory inventory) - { - int size = 0; - - for (int i = 0; i < inventory.getSizeInventory(); ++i) - { - ItemStack slot = inventory.getStackInSlot(i); - - if (slot != null) - { - size += slot.stackSize; - } - } - - 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, int flags) - { - if (first == null && second == null) - { - return true; - } - - 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_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; - } - } - - return first.getItem() == second.getItem(); - } - - public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) - { - return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); - } +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 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(); + + compoundTag.setInteger(NBT_SLOT, i); + + inventory.getStackInSlot(i).writeToNBT(compoundTag); + + tagList.appendTag(compoundTag); + } + } + + 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); + + 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); + + ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i)); + + 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); + + 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; + + while (stack.stackSize > 0) { + int amount = world.rand.nextInt(21) + 10; + + if (amount > stack.stackSize) { + amount = stack.stackSize; + } + + stack.stackSize -= amount; + + 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; + + if (stack.hasTagCompound()) { + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } + + world.spawnEntityInWorld(entity); + } + } + + 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; + } + } + + public static boolean canPushToInventorySlot(IInventory inventory, int i, ItemStack stack) { + ItemStack slot = inventory.getStackInSlot(i); + + if (slot == null) { + return true; + } + + if (!compareStackNoQuantity(slot, stack)) { + return false; + } + + return slot.stackSize + stack.stackSize < slot.getMaxStackSize(); + } + + 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); + + if (slot == null) { + inventory.setInventorySlotContents(i, stack); + + return; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; + + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } + + slot.stackSize += toAdd; + + toGo -= toAdd; + + if (toGo == 0) { + return; + } + } + } + } + + 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; + } + + ItemStack slot = inventory.getStackInSlot(i); + + if (slot == null) { + return true; + } else if (compareStackNoQuantity(slot, stack)) { + int toAdd = toGo; + + if (slot.stackSize + toAdd > slot.getMaxStackSize()) { + toAdd = slot.getMaxStackSize() - slot.stackSize; + } + + toGo -= toAdd; + + if (toGo == 0) { + break; + } + } + } + + return toGo == 0; + } + + public static int getInventoryItems(IInventory inventory) { + int size = 0; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + ItemStack slot = inventory.getStackInSlot(i); + + if (slot != null) { + size += slot.stackSize; + } + } + + 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, int flags) { + if (first == null && second == null) { + return true; + } + + 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_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; + } + } + + return first.getItem() == second.getItem(); + } + + 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