From 500fc47490960ee3fa5b7c2a727ed971e9a5bb7e Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 8 Oct 2015 15:42:42 +0200 Subject: [PATCH] Reduces visibility of internal fields/methods Reduces the visibility of all fields to private and create setters/getters when necessary. Exceptions are fields with GuiSync as these need to be public. Reduces the visibility of internal methods to private/protected/default when possible. --- src/main/java/appeng/block/AEBaseBlock.java | 16 +- .../java/appeng/block/AEBaseSlabBlock.java | 2 +- .../java/appeng/block/AEBaseTileBlock.java | 2 +- .../block/crafting/BlockCraftingUnit.java | 2 +- .../crafting/BlockMolecularAssembler.java | 14 +- .../misc/BlockQuartzGrowthAccelerator.java | 2 +- .../java/appeng/block/misc/BlockTinyTNT.java | 2 +- .../block/networking/BlockCableBus.java | 27 ++- .../java/appeng/block/solids/OreQuartz.java | 4 +- src/main/java/appeng/client/ClientHelper.java | 2 +- .../java/appeng/client/gui/AEBaseGui.java | 85 +++++--- .../gui/implementations/GuiCellWorkbench.java | 12 +- .../client/gui/implementations/GuiChest.java | 2 +- .../gui/implementations/GuiCondenser.java | 12 +- .../gui/implementations/GuiCraftConfirm.java | 54 ++--- .../gui/implementations/GuiCraftingCPU.java | 14 +- .../implementations/GuiCraftingStatus.java | 12 +- .../gui/implementations/GuiCraftingTerm.java | 8 +- .../client/gui/implementations/GuiDrive.java | 2 +- .../implementations/GuiFormationPlane.java | 8 +- .../client/gui/implementations/GuiIOPort.java | 10 +- .../gui/implementations/GuiInscriber.java | 8 +- .../gui/implementations/GuiInterface.java | 10 +- .../implementations/GuiInterfaceTerminal.java | 28 +-- .../gui/implementations/GuiLevelEmitter.java | 26 +-- .../client/gui/implementations/GuiMAC.java | 4 +- .../gui/implementations/GuiMEMonitorable.java | 125 +++++++---- .../gui/implementations/GuiNetworkStatus.java | 28 +-- .../gui/implementations/GuiNetworkTool.java | 4 +- .../gui/implementations/GuiPatternTerm.java | 18 +- .../gui/implementations/GuiPriority.java | 22 +- .../gui/implementations/GuiQuartzKnife.java | 2 +- .../gui/implementations/GuiSecurity.java | 28 +-- .../gui/implementations/GuiSpatialIOPort.java | 12 +- .../gui/implementations/GuiStorageBus.java | 16 +- .../gui/implementations/GuiUpgradeable.java | 20 +- .../implementations/GuiVibrationChamber.java | 6 +- .../gui/implementations/GuiWireless.java | 8 +- .../gui/implementations/GuiWirelessTerm.java | 1 - .../client/gui/widgets/GuiImgButton.java | 26 ++- .../client/gui/widgets/GuiNumberBox.java | 2 +- .../client/gui/widgets/GuiScrollbar.java | 2 +- .../client/gui/widgets/GuiTabButton.java | 12 +- .../appeng/client/me/ClientDCInternalInv.java | 21 +- .../java/appeng/client/me/InternalSlotME.java | 22 +- src/main/java/appeng/client/me/ItemRepo.java | 30 ++- .../appeng/client/me/SlotDisconnected.java | 9 +- src/main/java/appeng/client/me/SlotME.java | 4 +- .../client/render/AppEngRenderItem.java | 14 +- .../appeng/client/render/BaseBlockRender.java | 8 +- .../appeng/client/render/BlockRenderInfo.java | 9 +- .../appeng/client/render/BusRenderHelper.java | 30 +-- .../appeng/client/render/BusRenderer.java | 23 +- .../client/render/CableRenderHelper.java | 14 +- .../client/render/RenderBlocksWorkaround.java | 141 +++++++++---- .../appeng/client/render/TESRWrapper.java | 2 +- .../appeng/client/render/WorldRender.java | 10 +- .../render/blocks/RenderBlockAssembler.java | 16 +- .../render/blocks/RenderBlockCraftingCPU.java | 8 +- .../blocks/RenderBlockCraftingCPUMonitor.java | 14 +- .../render/blocks/RenderBlockCrank.java | 2 +- .../render/blocks/RenderBlockInscriber.java | 8 +- .../render/blocks/RenderBlockPaint.java | 14 +- .../blocks/RenderBlockQuartzAccelerator.java | 2 +- .../render/blocks/RenderBlockSkyChest.java | 20 +- .../render/blocks/RenderBlockSkyCompass.java | 17 +- .../render/blocks/RenderBlockWireless.java | 4 +- .../render/blocks/RenderQuartzGlass.java | 2 +- .../render/blocks/RendererCableBus.java | 14 +- .../client/render/effects/AssemblerFX.java | 8 +- .../client/render/effects/LightningArcFX.java | 18 +- .../client/render/effects/LightningFX.java | 37 ++-- .../items/ItemEncodedPatternRenderer.java | 4 +- .../client/render/model/ModelCompass.java | 14 +- .../client/texture/ExtraBlockTextures.java | 2 +- .../client/texture/ExtraItemTextures.java | 2 +- .../appeng/client/texture/FlippableIcon.java | 89 +++++--- .../appeng/client/texture/MissingIcon.java | 4 +- .../appeng/client/texture/OffsetIcon.java | 4 +- .../appeng/client/texture/TaughtIcon.java | 2 +- .../client/texture/TmpFlippableIcon.java | 13 +- .../appeng/container/AEBaseContainer.java | 153 +++++++++----- .../container/ContainerOpenContext.java | 64 +++++- .../appeng/container/guisync/GuiSync.java | 7 + .../ContainerCellWorkbench.java | 41 ++-- .../implementations/ContainerChest.java | 4 +- .../implementations/ContainerCondenser.java | 16 +- .../implementations/ContainerCraftAmount.java | 25 ++- .../ContainerCraftConfirm.java | 199 +++++++++++++----- .../implementations/ContainerCraftingCPU.java | 97 ++++++--- .../ContainerCraftingStatus.java | 17 +- .../ContainerCraftingTerm.java | 12 +- .../implementations/ContainerDrive.java | 5 +- .../ContainerFormationPlane.java | 33 +-- .../implementations/ContainerGrinder.java | 9 +- .../implementations/ContainerIOPort.java | 41 ++-- .../implementations/ContainerInscriber.java | 18 +- .../implementations/ContainerInterface.java | 28 ++- .../ContainerInterfaceTerminal.java | 22 +- .../ContainerLevelEmitter.java | 48 +++-- .../implementations/ContainerMAC.java | 22 +- .../ContainerMEMonitorable.java | 73 +++++-- .../ContainerMEPortableCell.java | 20 +- .../ContainerNetworkStatus.java | 54 ++++- .../implementations/ContainerNetworkTool.java | 22 +- .../implementations/ContainerPatternTerm.java | 85 +++++--- .../implementations/ContainerPriority.java | 4 +- .../implementations/ContainerQNB.java | 5 +- .../implementations/ContainerQuartzKnife.java | 21 +- .../implementations/ContainerSecurity.java | 30 ++- .../implementations/ContainerSkyChest.java | 2 +- .../ContainerSpatialIOPort.java | 56 ++++- .../implementations/ContainerStorageBus.java | 48 +++-- .../implementations/ContainerUpgradeable.java | 85 ++++++-- .../ContainerVibrationChamber.java | 15 +- .../implementations/ContainerWireless.java | 30 ++- .../ContainerWirelessTerm.java | 8 +- .../implementations/CraftingCPURecord.java | 32 ++- .../appeng/container/slot/AppEngSlot.java | 97 +++++++-- .../container/slot/OptionalSlotFake.java | 32 ++- .../container/slot/OptionalSlotNormal.java | 4 +- .../slot/OptionalSlotRestrictedInput.java | 4 +- .../container/slot/SlotCraftingMatrix.java | 2 +- .../container/slot/SlotCraftingTerm.java | 29 +-- .../java/appeng/container/slot/SlotFake.java | 3 - .../container/slot/SlotInaccessible.java | 2 +- .../appeng/container/slot/SlotMACPattern.java | 2 +- .../appeng/container/slot/SlotOutput.java | 2 +- .../container/slot/SlotPatternTerm.java | 6 +- .../container/slot/SlotPlayerHotBar.java | 2 +- .../appeng/container/slot/SlotPlayerInv.java | 2 +- .../container/slot/SlotRestrictedInput.java | 24 ++- src/main/java/appeng/core/AEConfig.java | 2 +- src/main/java/appeng/core/AELog.java | 2 +- src/main/java/appeng/core/ApiDefinitions.java | 4 +- src/main/java/appeng/core/AppEng.java | 4 +- src/main/java/appeng/core/CreativeTab.java | 2 +- .../java/appeng/core/CreativeTabFacade.java | 2 +- src/main/java/appeng/core/FacadeConfig.java | 2 +- .../appeng/core/FeatureHandlerRegistry.java | 2 +- .../java/appeng/core/FeatureRegistry.java | 2 +- src/main/java/appeng/core/IMCHandler.java | 2 +- src/main/java/appeng/core/RecipeLoader.java | 2 +- src/main/java/appeng/core/Registration.java | 6 +- src/main/java/appeng/core/api/ApiPart.java | 8 +- .../definitions/DefinitionConstructor.java | 10 +- .../appeng/core/features/BlockStackSrc.java | 4 +- .../core/features/ColoredItemDefinition.java | 4 +- .../core/features/FeaturedActiveChecker.java | 2 +- .../appeng/core/features/ItemStackSrc.java | 2 +- .../core/features/MaterialStackSrc.java | 4 +- .../features/registries/CellRegistry.java | 2 +- .../registries/ExternalStorageRegistry.java | 4 +- .../registries/GrinderRecipeManager.java | 2 +- .../registries/WirelessRangeResult.java | 36 ---- .../features/registries/WorldGenRegistry.java | 2 +- .../core/localization/ButtonToolTips.java | 2 +- .../appeng/core/localization/GuiText.java | 2 +- .../appeng/core/localization/WailaText.java | 2 +- .../java/appeng/core/settings/TickRates.java | 32 ++- .../stats/AchievementCraftingHandler.java | 6 +- .../core/stats/AchievementHierarchy.java | 2 +- .../core/stats/AchievementPickupHandler.java | 2 +- .../java/appeng/core/stats/Achievements.java | 20 +- .../core/stats/PlayerDifferentiator.java | 2 +- src/main/java/appeng/core/stats/Stats.java | 2 +- .../java/appeng/core/sync/AppEngPacket.java | 2 +- .../core/sync/AppEngPacketHandlerBase.java | 2 +- src/main/java/appeng/core/sync/GuiBridge.java | 12 +- .../java/appeng/core/sync/GuiHostType.java | 2 +- .../core/sync/network/NetworkHandler.java | 8 +- .../packets/PacketAssemblerAnimation.java | 6 +- .../appeng/core/sync/packets/PacketClick.java | 14 +- .../sync/packets/PacketCompassRequest.java | 10 +- .../sync/packets/PacketCompassResponse.java | 10 +- .../sync/packets/PacketCompressedNBT.java | 4 +- .../core/sync/packets/PacketCraftRequest.java | 18 +- .../sync/packets/PacketInventoryAction.java | 16 +- .../core/sync/packets/PacketLightning.java | 6 +- .../core/sync/packets/PacketMatterCannon.java | 14 +- .../sync/packets/PacketMockExplosion.java | 6 +- .../core/sync/packets/PacketNEIRecipe.java | 8 +- .../packets/PacketNewStorageDimension.java | 2 +- .../sync/packets/PacketPartPlacement.java | 12 +- .../core/sync/packets/PacketPartialItem.java | 4 +- .../core/sync/packets/PacketPatternSlot.java | 2 +- .../core/sync/packets/PacketProgressBar.java | 4 +- .../core/sync/packets/PacketSwapSlots.java | 4 +- .../core/sync/packets/PacketSwitchGuis.java | 10 +- .../sync/packets/PacketTransitionEffect.java | 10 +- .../core/sync/packets/PacketValueConfig.java | 8 +- .../appeng/core/worlddata/StorageData.java | 8 +- .../appeng/crafting/CraftBranchFailure.java | 2 +- .../crafting/CraftingCalculationFailure.java | 2 +- .../java/appeng/crafting/CraftingJob.java | 87 ++++---- .../java/appeng/crafting/CraftingLink.java | 56 +++-- .../appeng/crafting/CraftingLinkNexus.java | 80 ++++--- .../appeng/crafting/CraftingTreeNode.java | 23 +- .../appeng/crafting/CraftingTreeProcess.java | 32 +-- .../java/appeng/crafting/CraftingWatcher.java | 22 +- .../appeng/crafting/MECraftingInventory.java | 22 +- .../java/appeng/debug/TileChunkLoader.java | 6 +- .../java/appeng/debug/TileCubeGenerator.java | 12 +- .../java/appeng/debug/TilePhantomNode.java | 6 +- src/main/java/appeng/debug/ToolDebugCard.java | 4 +- src/main/java/appeng/debug/ToolEraser.java | 2 +- .../java/appeng/entity/AEBaseEntityItem.java | 2 +- .../appeng/entity/EntityChargedQuartz.java | 6 +- .../appeng/entity/EntityFloatingItem.java | 9 +- src/main/java/appeng/entity/EntityIds.java | 8 +- .../java/appeng/entity/EntitySingularity.java | 2 +- .../appeng/entity/RenderFloatingItem.java | 7 +- .../appeng/entity/RenderTinyTNTPrimed.java | 2 +- .../java/appeng/facade/FacadeContainer.java | 4 +- src/main/java/appeng/facade/FacadePart.java | 30 +-- src/main/java/appeng/fmp/CableBusPart.java | 105 ++++----- src/main/java/appeng/fmp/FMPEvent.java | 4 +- .../java/appeng/fmp/FMPPlacementHelper.java | 4 +- src/main/java/appeng/fmp/QuartzTorchPart.java | 2 +- .../java/appeng/helpers/DualityInterface.java | 65 +++--- .../helpers/IContainerCraftingPacket.java | 2 +- .../java/appeng/helpers/LocationRotation.java | 8 +- .../java/appeng/helpers/MetaRotation.java | 8 +- .../appeng/helpers/MultiCraftingTracker.java | 6 +- .../appeng/helpers/PlayerSecurityWrapper.java | 2 +- src/main/java/appeng/helpers/Splotch.java | 25 ++- .../helpers/WirelessTerminalGuiObject.java | 20 +- .../java/appeng/hooks/CompassManager.java | 23 +- src/main/java/appeng/hooks/CompassResult.java | 41 +++- src/main/java/appeng/hooks/TickHandler.java | 20 +- .../appeng/integration/IntegrationNode.java | 70 ++++-- .../integration/IntegrationRegistry.java | 8 +- .../modules/BCHelpers/BCPipeInventory.java | 4 +- .../integration/modules/BetterStorage.java | 2 +- .../java/appeng/integration/modules/FMP.java | 2 +- .../NEIHelpers/NEIAEShapedRecipeHandler.java | 12 +- .../NEIAEShapelessRecipeHandler.java | 12 +- .../NEIHelpers/NEICraftingHandler.java | 7 +- .../NEIHelpers/NEIFacadeRecipeHandler.java | 6 +- .../NEIHelpers/NEIGrinderRecipeHandler.java | 12 +- .../NEIHelpers/NEIInscriberRecipeHandler.java | 8 +- .../NEIHelpers/NEIWorldCraftingHandler.java | 2 +- .../TerminalCraftingSlotFinder.java | 4 +- .../integration/modules/helpers/BSCrate.java | 5 +- .../modules/helpers/BSCrateHandler.java | 2 +- .../helpers/BSCrateStorageAdaptor.java | 7 +- .../modules/helpers/FMPPacketEvent.java | 7 +- .../modules/helpers/FactorizationBarrel.java | 8 +- .../MinefactoryReloadedDeepStorageUnit.java | 4 +- .../appeng/items/contents/CellConfig.java | 2 +- .../appeng/items/contents/CellUpgrades.java | 2 +- .../items/contents/NetworkToolViewer.java | 6 +- .../appeng/items/contents/QuartzKnifeObj.java | 2 +- .../items/materials/ItemMultiMaterial.java | 31 +-- .../appeng/items/materials/MaterialType.java | 68 ++++-- .../appeng/items/misc/ItemCrystalSeed.java | 10 +- .../java/appeng/items/misc/ItemPaintBall.java | 4 +- .../appeng/items/parts/ItemMultiPart.java | 10 +- .../java/appeng/items/parts/PartType.java | 27 ++- .../items/storage/ItemSpatialStorageCell.java | 2 +- .../tools/powered/ToolColorApplicator.java | 6 +- .../tools/powered/ToolEntropyManipulator.java | 24 +-- src/main/java/appeng/me/Grid.java | 18 +- src/main/java/appeng/me/GridCacheWrapper.java | 23 +- src/main/java/appeng/me/GridConnection.java | 20 +- src/main/java/appeng/me/GridNode.java | 72 ++++--- .../java/appeng/me/GridSplitDetector.java | 18 +- src/main/java/appeng/me/GridStorage.java | 22 +- .../java/appeng/me/GridStorageSearch.java | 14 +- src/main/java/appeng/me/NetworkEventBus.java | 26 +-- .../appeng/me/cache/CraftingGridCache.java | 13 +- .../java/appeng/me/cache/EnergyGridCache.java | 69 +++--- .../appeng/me/cache/GridStorageCache.java | 32 ++- .../java/appeng/me/cache/NetworkMonitor.java | 16 +- src/main/java/appeng/me/cache/P2PCache.java | 34 +-- .../java/appeng/me/cache/PathGridCache.java | 86 +++++--- .../java/appeng/me/cache/SecurityCache.java | 15 +- .../appeng/me/cache/SpatialPylonCache.java | 47 ++--- .../appeng/me/cache/TickManagerCache.java | 34 +-- .../me/cache/helpers/ConnectionWrapper.java | 14 +- .../appeng/me/cache/helpers/Connections.java | 39 +++- .../appeng/me/cache/helpers/TickTracker.java | 85 +++++--- .../me/cache/helpers/TunnelCollection.java | 4 +- .../me/cache/helpers/TunnelConnection.java | 14 +- .../me/cache/helpers/TunnelIterator.java | 6 +- .../java/appeng/me/cluster/MBCalculator.java | 6 +- .../CraftingCPUCalculator.java | 2 +- .../implementations/CraftingCPUCluster.java | 34 +-- .../implementations/QuantumCalculator.java | 4 +- .../implementations/QuantumCluster.java | 76 ++++--- .../SpatialPylonCalculator.java | 2 +- .../implementations/SpatialPylonCluster.java | 71 +++++-- .../appeng/me/energy/EnergyThreshold.java | 22 +- .../java/appeng/me/energy/EnergyWatcher.java | 24 +-- .../appeng/me/helpers/AENetworkProxy.java | 16 +- .../me/helpers/AENetworkProxyMultiblock.java | 2 +- .../appeng/me/helpers/ChannelPowerSrc.java | 4 +- .../me/helpers/GenericInterestManager.java | 8 +- .../me/pathfinding/ControllerValidator.java | 42 +++- .../appeng/me/pathfinding/PathSegment.java | 30 ++- .../java/appeng/me/storage/CellInventory.java | 4 +- .../me/storage/CellInventoryHandler.java | 2 +- .../me/storage/CreativeCellInventory.java | 2 +- .../java/appeng/me/storage/DriveWatcher.java | 8 +- .../java/appeng/me/storage/ItemWatcher.java | 22 +- .../me/storage/MEIInventoryWrapper.java | 4 +- .../appeng/me/storage/MEInventoryHandler.java | 13 +- .../me/storage/MEMonitorIInventory.java | 48 +++-- .../me/storage/MEMonitorPassThrough.java | 24 ++- .../java/appeng/me/storage/MEPassThrough.java | 9 +- .../me/storage/NetworkInventoryHandler.java | 14 +- .../appeng/me/storage/SecurityInventory.java | 17 +- .../appeng/me/storage/VoidFluidInventory.java | 2 +- .../appeng/me/storage/VoidItemInventory.java | 2 +- src/main/java/appeng/parts/AEBasePart.java | 57 +++-- .../java/appeng/parts/BusCollisionHelper.java | 2 +- .../java/appeng/parts/CableBusContainer.java | 26 ++- .../java/appeng/parts/PartBasicState.java | 40 ++-- src/main/java/appeng/parts/PartPlacement.java | 20 +- .../automation/PartAnnihilationPlane.java | 88 ++++---- .../parts/automation/PartExportBus.java | 30 +-- .../parts/automation/PartFormationPlane.java | 60 +++--- .../parts/automation/PartImportBus.java | 22 +- .../parts/automation/PartLevelEmitter.java | 77 ++++--- .../parts/automation/PartSharedItemBus.java | 29 +-- .../parts/automation/PartUpgradeable.java | 6 +- .../parts/automation/UpgradeInventory.java | 2 +- .../appeng/parts/layers/InvLayerData.java | 20 +- src/main/java/appeng/parts/layers/InvSot.java | 16 +- .../parts/layers/LayerIFluidHandler.java | 2 +- .../parts/layers/LayerISidedInventory.java | 2 +- .../appeng/parts/misc/PartCableAnchor.java | 8 +- .../java/appeng/parts/misc/PartInterface.java | 18 +- .../parts/misc/PartInvertedToggleBus.java | 8 +- .../appeng/parts/misc/PartStorageBus.java | 72 +++---- .../java/appeng/parts/misc/PartToggleBus.java | 65 +++--- .../appeng/parts/networking/PartCable.java | 98 +++++---- .../parts/networking/PartCableCovered.java | 18 +- .../parts/networking/PartCableSmart.java | 24 +-- .../parts/networking/PartDenseCable.java | 36 ++-- .../parts/networking/PartQuartzFiber.java | 16 +- .../appeng/parts/p2p/PartP2PIC2Power.java | 22 +- .../java/appeng/parts/p2p/PartP2PItems.java | 36 ++-- .../java/appeng/parts/p2p/PartP2PLight.java | 28 +-- .../java/appeng/parts/p2p/PartP2PLiquids.java | 26 +-- .../parts/p2p/PartP2POpenComputers.java | 16 +- .../appeng/parts/p2p/PartP2PPressure.java | 12 +- .../java/appeng/parts/p2p/PartP2PRFPower.java | 20 +- .../appeng/parts/p2p/PartP2PRedstone.java | 44 ++-- .../java/appeng/parts/p2p/PartP2PTunnel.java | 88 +++++--- .../appeng/parts/p2p/PartP2PTunnelME.java | 48 ++--- .../parts/reporting/AbstractPartDisplay.java | 8 +- .../parts/reporting/AbstractPartMonitor.java | 12 +- .../parts/reporting/AbstractPartPanel.java | 4 +- .../reporting/AbstractPartReporting.java | 18 +- .../parts/reporting/AbstractPartTerminal.java | 8 +- .../reporting/PartConversionMonitor.java | 18 +- .../parts/reporting/PartCraftingTerminal.java | 8 +- .../reporting/PartInterfaceTerminal.java | 2 +- .../parts/reporting/PartPatternTerminal.java | 10 +- .../java/appeng/recipes/AEItemResolver.java | 4 +- .../java/appeng/recipes/GroupIngredient.java | 5 +- .../appeng/recipes/MissedIngredientSet.java | 2 +- src/main/java/appeng/recipes/RecipeData.java | 14 +- .../java/appeng/recipes/RecipeHandler.java | 6 +- .../java/appeng/recipes/handlers/Crusher.java | 4 +- .../java/appeng/recipes/handlers/Grind.java | 4 +- .../java/appeng/recipes/handlers/GrindFZ.java | 4 +- .../appeng/recipes/handlers/HCCrusher.java | 4 +- .../appeng/recipes/handlers/Macerator.java | 4 +- .../appeng/recipes/handlers/MekCrusher.java | 4 +- .../recipes/handlers/MekEnrichment.java | 4 +- .../recipes/handlers/OreRegistration.java | 4 +- .../appeng/recipes/handlers/Pulverizer.java | 4 +- .../java/appeng/recipes/handlers/Shaped.java | 4 +- .../appeng/recipes/handlers/Shapeless.java | 4 +- .../java/appeng/recipes/handlers/Smelt.java | 4 +- .../server/subcommands/ChunkLogger.java | 2 +- .../java/appeng/services/CompassService.java | 4 +- .../services/compass/CompassException.java | 2 +- .../services/compass/CompassRegion.java | 6 +- src/main/java/appeng/spatial/CachedPlane.java | 74 ++++--- .../appeng/spatial/StorageChunkProvider.java | 4 +- .../java/appeng/spatial/StorageHelper.java | 46 ++-- src/main/java/appeng/tile/AEBaseTile.java | 8 +- .../crafting/TileCraftingMonitorTile.java | 30 ++- .../crafting/TileCraftingStorageTile.java | 2 +- .../tile/crafting/TileCraftingTile.java | 66 ++++-- .../tile/crafting/TileMolecularAssembler.java | 24 ++- .../appeng/tile/grid/AENetworkInvTile.java | 25 ++- .../appeng/tile/grid/AENetworkPowerTile.java | 19 +- .../java/appeng/tile/grid/AENetworkTile.java | 18 +- .../appeng/tile/grindstone/TileCrank.java | 24 ++- .../appeng/tile/grindstone/TileGrinder.java | 8 +- .../inventory/AppEngInternalAEInventory.java | 12 +- .../inventory/AppEngInternalInventory.java | 52 +++-- .../appeng/tile/misc/TileCellWorkbench.java | 12 +- .../java/appeng/tile/misc/TileCharger.java | 42 ++-- .../java/appeng/tile/misc/TileCondenser.java | 30 ++- .../java/appeng/tile/misc/TileInscriber.java | 107 ++++++---- .../java/appeng/tile/misc/TileInterface.java | 8 +- .../appeng/tile/misc/TileLightDetector.java | 4 +- src/main/java/appeng/tile/misc/TilePaint.java | 16 +- .../misc/TileQuartzGrowthAccelerator.java | 25 ++- .../java/appeng/tile/misc/TileSecurity.java | 43 ++-- .../tile/misc/TileVibrationChamber.java | 104 +++++---- .../appeng/tile/networking/TileCableBus.java | 88 ++++---- .../tile/networking/TileCableBusTESR.java | 4 +- .../tile/networking/TileController.java | 24 +-- .../networking/TileCreativeEnergyCell.java | 2 +- .../tile/networking/TileDenseEnergyCell.java | 2 +- .../tile/networking/TileEnergyAcceptor.java | 14 +- .../tile/networking/TileEnergyCell.java | 38 ++-- .../appeng/tile/networking/TileWireless.java | 50 +++-- .../tile/powersink/AERootPoweredTile.java | 93 +++++--- src/main/java/appeng/tile/powersink/IC2.java | 4 +- .../java/appeng/tile/powersink/MekJoules.java | 2 +- .../appeng/tile/qnb/TileQuantumBridge.java | 48 +++-- .../tile/spatial/TileSpatialIOPort.java | 12 +- .../appeng/tile/spatial/TileSpatialPylon.java | 27 +-- .../java/appeng/tile/storage/TileChest.java | 78 +++---- .../java/appeng/tile/storage/TileDrive.java | 46 ++-- .../java/appeng/tile/storage/TileIOPort.java | 20 +- .../appeng/tile/storage/TileSkyChest.java | 62 ++++-- src/main/java/appeng/util/BlockUpdate.java | 6 +- .../util/InWorldToolOperationResult.java | 14 +- src/main/java/appeng/util/ItemSorters.java | 21 +- src/main/java/appeng/util/LookDirection.java | 14 +- src/main/java/appeng/util/Platform.java | 18 +- .../appeng/util/inv/AdaptorIInventory.java | 12 +- src/main/java/appeng/util/inv/IMEAdaptor.java | 22 +- .../appeng/util/inv/IMEAdaptorIterator.java | 10 +- .../util/inv/IMEInventoryDestination.java | 2 +- .../util/inv/ItemListIgnoreCrafting.java | 2 +- src/main/java/appeng/util/inv/ItemSlot.java | 26 ++- .../util/inv/WrapperChainedInventory.java | 16 +- .../java/appeng/util/inv/WrapperInvSlot.java | 2 +- .../util/inv/WrapperInventoryRange.java | 52 +++-- .../util/inv/WrapperMCISidedInventory.java | 10 +- .../java/appeng/util/inv/WrapperTEPipe.java | 118 ----------- .../java/appeng/util/item/AEFluidStack.java | 12 +- src/main/java/appeng/util/item/AEItemDef.java | 161 +++++++++++--- .../java/appeng/util/item/AEItemStack.java | 164 ++++++++------- .../java/appeng/util/item/AESharedNBT.java | 14 +- src/main/java/appeng/util/item/AEStack.java | 10 +- src/main/java/appeng/util/item/ItemList.java | 2 +- .../java/appeng/util/item/ItemModList.java | 4 +- src/main/java/appeng/util/item/OreHelper.java | 12 +- .../java/appeng/util/item/OreReference.java | 6 +- .../appeng/util/item/SharedSearchObject.java | 32 ++- .../appeng/util/item/UnsortedItemList.java | 14 +- .../util/iterators/StackToSlotIterator.java | 8 +- .../util/prioitylist/DefaultPriorityList.java | 2 +- .../util/prioitylist/FuzzyPriorityList.java | 4 +- .../util/prioitylist/PrecisePriorityList.java | 2 +- .../java/appeng/worldgen/MeteoritePlacer.java | 10 +- .../appeng/worldgen/MeteoriteWorldGen.java | 8 +- .../appeng/worldgen/meteorite/ChunkOnly.java | 12 +- .../worldgen/meteorite/FalloutCopy.java | 6 +- .../worldgen/meteorite/FalloutSand.java | 2 +- .../worldgen/meteorite/FalloutSnow.java | 4 +- .../meteorite/MeteoriteBlockPutter.java | 2 +- .../worldgen/meteorite/StandardWorld.java | 16 +- 463 files changed, 5670 insertions(+), 3757 deletions(-) delete mode 100644 src/main/java/appeng/core/features/registries/WirelessRangeResult.java delete mode 100644 src/main/java/appeng/util/inv/WrapperTEPipe.java diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 3b9d2958..438efb88 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -75,7 +75,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature protected boolean isInventory = false; private IFeatureHandler handler; @SideOnly( Side.CLIENT ) - BlockRenderInfo renderInfo; + private BlockRenderInfo renderInfo; protected AEBaseBlock( final Material mat ) { @@ -155,7 +155,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature return BaseBlockRender.class; } - public IIcon unmappedGetIcon( final IBlockAccess w, final int x, final int y, final int z, final int s ) + IIcon unmappedGetIcon( final IBlockAccess w, final int x, final int y, final int z, final int s ) { return super.getIcon( w, x, y, z, s ); } @@ -276,15 +276,15 @@ public abstract class AEBaseBlock extends Block implements IAEFeature { this.setBlockBounds( (float) bb.minX, (float) bb.minY, (float) bb.minZ, (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ ); - final MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, ld.a, ld.b ); + final MovingObjectPosition r = super.collisionRayTrace( w, x, y, z, ld.getA(), ld.getB() ); this.setBlockBounds( 0, 0, 0, 1, 1, 1 ); if( r != null ) { - final double xLen = ( ld.a.xCoord - r.hitVec.xCoord ); - final double yLen = ( ld.a.yCoord - r.hitVec.yCoord ); - final double zLen = ( ld.a.zCoord - r.hitVec.zCoord ); + final double xLen = ( ld.getA().xCoord - r.hitVec.xCoord ); + final double yLen = ( ld.getA().yCoord - r.hitVec.yCoord ); + final double zLen = ( ld.getA().zCoord - r.hitVec.zCoord ); final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen; @@ -528,7 +528,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature super.getSubBlocks( item, tabs, itemStacks ); } - int mapRotation( final IBlockAccess w, final int x, final int y, final int z, final int s ) + private int mapRotation( final IBlockAccess w, final int x, final int y, final int z, final int s ) { final IOrientable ori = this.getOrientable( w, x, y, z ); @@ -611,7 +611,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature return this.getUnlocalizedName(); } - public void addInformation( final ItemStack is, final EntityPlayer player, final List lines, final boolean advancedItemTooltips ) + void addInformation( final ItemStack is, final EntityPlayer player, final List lines, final boolean advancedItemTooltips ) { } diff --git a/src/main/java/appeng/block/AEBaseSlabBlock.java b/src/main/java/appeng/block/AEBaseSlabBlock.java index d450bb09..35b5f21c 100644 --- a/src/main/java/appeng/block/AEBaseSlabBlock.java +++ b/src/main/java/appeng/block/AEBaseSlabBlock.java @@ -63,7 +63,7 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature this.features = !this.field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null; } - public AEBaseSlabBlock setSlabs( final AEBaseSlabBlock slabs ) + private AEBaseSlabBlock setSlabs( final AEBaseSlabBlock slabs ) { this.slabs = slabs; return this; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index ae4ee1c5..54b2c949 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -98,7 +98,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, ReflectionHelper.setPrivateValue( Block.class, this, b, "isTileProvider" ); } - public boolean hasBlockTileEntity() + private boolean hasBlockTileEntity() { return this.tileEntityType != null; } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index 6dfdf6fe..e019024f 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -47,7 +47,7 @@ import appeng.util.Platform; public class BlockCraftingUnit extends AEBaseTileBlock { - public static final int FLAG_FORMED = 8; + static final int FLAG_FORMED = 8; public BlockCraftingUnit() { diff --git a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java index 864754d4..296ccf92 100644 --- a/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java +++ b/src/main/java/appeng/block/crafting/BlockMolecularAssembler.java @@ -41,7 +41,7 @@ import appeng.util.Platform; public class BlockMolecularAssembler extends AEBaseTileBlock { - public static boolean booleanAlphaPass = false; + private static boolean booleanAlphaPass = false; public BlockMolecularAssembler() { @@ -62,7 +62,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock @Override public boolean canRenderInPass( final int pass ) { - booleanAlphaPass = pass == 1; + setBooleanAlphaPass( pass == 1 ); return pass == 0 || pass == 1; } @@ -84,4 +84,14 @@ public class BlockMolecularAssembler extends AEBaseTileBlock } return false; } + + public static boolean isBooleanAlphaPass() + { + return booleanAlphaPass; + } + + private static void setBooleanAlphaPass( final boolean booleanAlphaPass ) + { + BlockMolecularAssembler.booleanAlphaPass = booleanAlphaPass; + } } diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 7e01d777..36e1d08d 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -71,7 +71,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr final TileQuartzGrowthAccelerator cga = this.getTileEntity( w, x, y, z ); - if( cga != null && cga.hasPower && CommonHelper.proxy.shouldAddParticles( r ) ) + if( cga != null && cga.isPowered() && CommonHelper.proxy.shouldAddParticles( r ) ) { final double d0 = r.nextFloat() - 0.5F; final double d1 = r.nextFloat() - 0.5F; diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 006d465a..b3b7c5ab 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -66,7 +66,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision this.setHardness( 0F ); this.setFeature( EnumSet.of( AEFeature.TinyTNT ) ); - EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.TINY_TNT, AppEng.instance(), 16, 4, true ); + EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true ); } @Override diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 0d39a43e..5e5c657b 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -64,6 +64,7 @@ import appeng.core.CommonHelper; import appeng.core.features.AECableBusFeatureHandler; import appeng.core.features.AEFeature; import appeng.helpers.AEGlassMaterial; +import appeng.helpers.Reflected; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.integration.abstraction.IFMP; @@ -82,13 +83,19 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection { private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer(); - public static Class noTesrTile; - public static Class tesrTile; + private static Class noTesrTile; + private static Class tesrTile; + /** * Immibis MB Support. + * + * It will look for a field named ImmibisMicroblocks_TransformableBlockMarker or + * ImmibisMicroblocks_TransformableTileEntityMarker, modifiers, type, etc can be ignored. */ - boolean ImmibisMicroblocks_TransformableBlockMarker = true; - int myColorMultiplier = 0xffffff; + @Reflected + private static final boolean ImmibisMicroblocks_TransformableBlockMarker = true; + + private int myColorMultiplier = 0xffffff; public BlockCableBus() { @@ -396,7 +403,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection if( te instanceof TileCableBus ) { - out = ( (TileCableBus) te ).cb; + out = ( (TileCableBus) te ).getCableBus(); } else if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.FMP ) ) { @@ -516,4 +523,14 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection { this.myColorMultiplier = color; } + + public static Class getTesrTile() + { + return BlockCableBus.tesrTile; + } + + public static Class getNoTesrTile() + { + return BlockCableBus.noTesrTile; + } } diff --git a/src/main/java/appeng/block/solids/OreQuartz.java b/src/main/java/appeng/block/solids/OreQuartz.java index 910ec2f4..261b3217 100644 --- a/src/main/java/appeng/block/solids/OreQuartz.java +++ b/src/main/java/appeng/block/solids/OreQuartz.java @@ -150,12 +150,12 @@ public class OreQuartz extends AEBaseBlock } } - public void setBoostBrightnessLow( final int boostBrightnessLow ) + void setBoostBrightnessLow( final int boostBrightnessLow ) { this.boostBrightnessLow = boostBrightnessLow; } - public void setBoostBrightnessHigh( final int boostBrightnessHigh ) + void setBoostBrightnessHigh( final int boostBrightnessHigh ) { this.boostBrightnessHigh = boostBrightnessHigh; } diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 752d4187..cd8b690d 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -128,7 +128,7 @@ public class ClientHelper extends ServerHelper @Override public void bindTileEntitySpecialRenderer( final Class tile, final AEBaseBlock blk ) { - final BaseBlockRender bbr = blk.getRendererInstance().rendererInstance; + final BaseBlockRender bbr = blk.getRendererInstance().getRendererInstance(); if( bbr.hasTESR() && tile != null ) { ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) ); diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 84ddb78f..41439f95 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -83,17 +83,16 @@ import appeng.integration.abstraction.INEI; public abstract class AEBaseGui extends GuiContainer { - public static boolean switchingGuis; - protected final List meSlots = new LinkedList(); + private static boolean switchingGuis; + private final List meSlots = new LinkedList(); // drag y - final Set drag_click = new HashSet(); - final AppEngRenderItem aeRenderItem = new AppEngRenderItem(); - protected GuiScrollbar myScrollBar = null; - boolean disableShiftClick = false; - Stopwatch dbl_clickTimer = Stopwatch.createStarted(); - ItemStack dbl_whichItem; - Slot bl_clicked; - boolean useNEI = false; + private final Set drag_click = new HashSet(); + private final AppEngRenderItem aeRenderItem = new AppEngRenderItem(); + private GuiScrollbar scrollBar = null; + private boolean disableShiftClick = false; + private Stopwatch dbl_clickTimer = Stopwatch.createStarted(); + private ItemStack dbl_whichItem; + private Slot bl_clicked; private boolean subGui; public AEBaseGui( final Container container ) @@ -161,9 +160,9 @@ public abstract class AEBaseGui extends GuiContainer super.drawScreen( mouseX, mouseY, btn ); final boolean hasClicked = Mouse.isButtonDown( 0 ); - if( hasClicked && this.myScrollBar != null ) + if( hasClicked && this.scrollBar != null ) { - this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop ); + this.scrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop ); } for( final Object c : this.buttonList ) @@ -289,9 +288,9 @@ public abstract class AEBaseGui extends GuiContainer final int oy = this.guiTop; // (height - ySize) / 2; GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); - if( this.myScrollBar != null ) + if( this.scrollBar != null ) { - this.myScrollBar.draw( this ); + this.scrollBar.draw( this ); } this.drawFG( ox, oy, x, y ); @@ -317,14 +316,14 @@ public abstract class AEBaseGui extends GuiContainer { if( fs.isEnabled() ) { - this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.srcX - 1, fs.srcY - 1, 18, 18 ); + this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18, 18 ); } else { GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 0.4F ); GL11.glEnable( GL11.GL_BLEND ); - this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.srcX - 1, fs.srcY - 1, 18, 18 ); + this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18, 18 ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glPopAttrib(); } @@ -490,7 +489,7 @@ public abstract class AEBaseGui extends GuiContainer if( action != null ) { - final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).mySlot.id ); + final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() ); NetworkHandler.instance.sendToServer( p ); } @@ -680,13 +679,13 @@ public abstract class AEBaseGui extends GuiContainer final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; this.mouseWheelEvent( x, y, i / Math.abs( i ) ); } - else if( i != 0 && this.myScrollBar != null ) + else if( i != 0 && this.scrollBar != null ) { - this.myScrollBar.wheel( i ); + this.scrollBar.wheel( i ); } } - protected void mouseWheelEvent( final int x, final int y, final int wheel ) + private void mouseWheelEvent( final int x, final int y, final int wheel ) { final Slot slot = this.getSlot( x, y ); if( slot instanceof SlotME ) @@ -744,22 +743,17 @@ public abstract class AEBaseGui extends GuiContainer { if( this.inventorySlots instanceof AEBaseContainer ) { - return ( (AEBaseContainer) this.inventorySlots ).customName != null; + return ( (AEBaseContainer) this.inventorySlots ).getCustomName() != null; } return false; } private String getInventoryName() { - return ( (AEBaseContainer) this.inventorySlots ).customName; + return ( (AEBaseContainer) this.inventorySlots ).getCustomName(); } - public void a( final Slot s ) - { - this.drawSlot( s ); - } - - public void drawSlot( final Slot s ) + private void drawSlot( final Slot s ) { if( s instanceof SlotME ) { @@ -779,7 +773,7 @@ public abstract class AEBaseGui extends GuiContainer this.zLevel = 0.0F; itemRender.zLevel = 0.0F; - this.aeRenderItem.aeStack = ( (SlotME) s ).getAEStack(); + this.aeRenderItem.setAeStack( ( (SlotME) s ).getAEStack() ); this.safeDrawSlot( s ); } @@ -841,7 +835,7 @@ public abstract class AEBaseGui extends GuiContainer if( is != null && s instanceof AppEngSlot ) { - if( ( (AppEngSlot) s ).isValid == hasCalculatedValidness.NotAvailable ) + if( ( (AppEngSlot) s ).getIsValid() == hasCalculatedValidness.NotAvailable ) { boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled || s instanceof SlotInaccessible || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected; if( isValid && s instanceof SlotRestrictedInput ) @@ -855,10 +849,10 @@ public abstract class AEBaseGui extends GuiContainer AELog.error( err ); } } - ( (AppEngSlot) s ).isValid = isValid ? hasCalculatedValidness.Valid : hasCalculatedValidness.Invalid; + ( (AppEngSlot) s ).setIsValid( isValid ? hasCalculatedValidness.Valid : hasCalculatedValidness.Invalid ); } - if( ( (AppEngSlot) s ).isValid == hasCalculatedValidness.Invalid ) + if( ( (AppEngSlot) s ).getIsValid() == hasCalculatedValidness.Invalid ) { this.zLevel = 100.0F; itemRender.zLevel = 100.0F; @@ -874,7 +868,7 @@ public abstract class AEBaseGui extends GuiContainer if( s instanceof AppEngSlot ) { - ( (AppEngSlot) s ).isDisplay = true; + ( (AppEngSlot) s ).setDisplay( true ); this.safeDrawSlot( s ); } else @@ -933,4 +927,29 @@ public abstract class AEBaseGui extends GuiContainer { this.drawSlot( s ); } + + protected GuiScrollbar getScrollBar() + { + return this.scrollBar; + } + + protected void setScrollBar( final GuiScrollbar myScrollBar ) + { + this.scrollBar = myScrollBar; + } + + protected List getMeSlots() + { + return this.meSlots; + } + + public static final synchronized boolean isSwitchingGuis() + { + return switchingGuis; + } + + public static final synchronized void setSwitchingGuis( final boolean switchingGuis ) + { + AEBaseGui.switchingGuis = switchingGuis; + } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java index a0243e3d..a26778dd 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java @@ -47,19 +47,17 @@ import appeng.util.Platform; public class GuiCellWorkbench extends GuiUpgradeable { - final ContainerCellWorkbench workbench; - final TileCellWorkbench tcw; + private final ContainerCellWorkbench workbench; - GuiImgButton clear; - GuiImgButton partition; - GuiToggleButton copyMode; + private GuiImgButton clear; + private GuiImgButton partition; + private GuiToggleButton copyMode; public GuiCellWorkbench( final InventoryPlayer inventoryPlayer, final TileCellWorkbench te ) { super( new ContainerCellWorkbench( inventoryPlayer, te ) ); this.workbench = (ContainerCellWorkbench) this.inventorySlots; this.ySize = 251; - this.tcw = te; } @Override @@ -135,7 +133,7 @@ public class GuiCellWorkbench extends GuiUpgradeable @Override protected void handleButtonVisibility() { - this.copyMode.setState( this.workbench.copyMode == CopyMode.CLEAR_ON_REMOVE ); + this.copyMode.setState( this.workbench.getCopyMode() == CopyMode.CLEAR_ON_REMOVE ); boolean hasFuzzy = false; final IInventory inv = this.workbench.getCellUpgradeInventory(); diff --git a/src/main/java/appeng/client/gui/implementations/GuiChest.java b/src/main/java/appeng/client/gui/implementations/GuiChest.java index 8c710ba5..f7deef8f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiChest.java +++ b/src/main/java/appeng/client/gui/implementations/GuiChest.java @@ -35,7 +35,7 @@ import appeng.tile.storage.TileChest; public class GuiChest extends AEBaseGui { - GuiTabButton priority; + private GuiTabButton priority; public GuiChest( final InventoryPlayer inventoryPlayer, final TileChest te ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java index bda7aeae..4c854e00 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCondenser.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCondenser.java @@ -39,9 +39,9 @@ import appeng.tile.misc.TileCondenser; public class GuiCondenser extends AEBaseGui { - final ContainerCondenser cvc; - GuiProgressBar pb; - GuiImgButton mode; + private final ContainerCondenser cvc; + private GuiProgressBar pb; + private GuiImgButton mode; public GuiCondenser( final InventoryPlayer inventoryPlayer, final TileCondenser te ) { @@ -70,7 +70,7 @@ public class GuiCondenser extends AEBaseGui this.pb = new GuiProgressBar( this.cvc, "guis/condenser.png", 120 + this.guiLeft, 25 + this.guiTop, 178, 25, 6, 18, Direction.VERTICAL, GuiText.StoredEnergy.getLocal() ); - this.mode = new GuiImgButton( 128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, this.cvc.output ); + this.mode = new GuiImgButton( 128 + this.guiLeft, 52 + this.guiTop, Settings.CONDENSER_OUTPUT, this.cvc.getOutput() ); this.buttonList.add( this.pb ); this.buttonList.add( this.mode ); @@ -82,8 +82,8 @@ public class GuiCondenser extends AEBaseGui this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Condenser.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); - this.mode.set( this.cvc.output ); - this.mode.fillVar = String.valueOf( this.cvc.output.requiredPower ); + this.mode.set( this.cvc.getOutput() ); + this.mode.setFillVar( String.valueOf( this.cvc.getOutput().requiredPower ) ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index e5997213..71d2ccbf 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -58,28 +58,30 @@ import appeng.util.Platform; public class GuiCraftConfirm extends AEBaseGui { - final ContainerCraftConfirm ccc; + private final ContainerCraftConfirm ccc; - final int rows = 5; + private final int rows = 5; - final IItemList storage = AEApi.instance().storage().createItemList(); - final IItemList pending = AEApi.instance().storage().createItemList(); - final IItemList missing = AEApi.instance().storage().createItemList(); + private final IItemList storage = AEApi.instance().storage().createItemList(); + private final IItemList pending = AEApi.instance().storage().createItemList(); + private final IItemList missing = AEApi.instance().storage().createItemList(); - final List visual = new ArrayList(); + private final List visual = new ArrayList(); - GuiBridge OriginalGui; - GuiButton cancel; - GuiButton start; - GuiButton selectCPU; - int tooltip = -1; + private GuiBridge OriginalGui; + private GuiButton cancel; + private GuiButton start; + private GuiButton selectCPU; + private int tooltip = -1; public GuiCraftConfirm( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( new ContainerCraftConfirm( inventoryPlayer, te ) ); this.xSize = 238; this.ySize = 206; - this.myScrollBar = new GuiScrollbar(); + + final GuiScrollbar scrollbar = new GuiScrollbar(); + this.setScrollBar( scrollbar ); this.ccc = (ContainerCraftConfirm) this.inventorySlots; @@ -106,7 +108,7 @@ public class GuiCraftConfirm extends AEBaseGui boolean isAutoStart() { - return ( (ContainerCraftConfirm) this.inventorySlots ).autoStart; + return ( (ContainerCraftConfirm) this.inventorySlots ).isAutoStart(); } @Override @@ -135,7 +137,7 @@ public class GuiCraftConfirm extends AEBaseGui { this.updateCPUButtonText(); - this.start.enabled = !( this.ccc.noCPU || this.isSimulation() ); + this.start.enabled = !( this.ccc.hasNoCPU() || this.isSimulation() ); this.selectCPU.enabled = !this.isSimulation(); final int gx = ( this.width - this.xSize ) / 2; @@ -175,20 +177,20 @@ public class GuiCraftConfirm extends AEBaseGui private void updateCPUButtonText() { String btnTextText = GuiText.CraftingCPU.getLocal() + ": " + GuiText.Automatic.getLocal(); - if( this.ccc.selectedCpu >= 0 )// && status.selectedCpu < status.cpus.size() ) + if( this.ccc.getSelectedCpu() >= 0 )// && status.selectedCpu < status.cpus.size() ) { - if( this.ccc.myName.length() > 0 ) + if( this.ccc.getName().length() > 0 ) { - final String name = this.ccc.myName.substring( 0, Math.min( 20, this.ccc.myName.length() ) ); + final String name = this.ccc.getName().substring( 0, Math.min( 20, this.ccc.getName().length() ) ); btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name; } else { - btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.ccc.selectedCpu; + btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.ccc.getSelectedCpu(); } } - if( this.ccc.noCPU ) + if( this.ccc.hasNoCPU() ) { btnTextText = GuiText.NoCraftingCPUs.getLocal(); } @@ -196,15 +198,15 @@ public class GuiCraftConfirm extends AEBaseGui this.selectCPU.displayString = btnTextText; } - boolean isSimulation() + private boolean isSimulation() { - return ( (ContainerCraftConfirm) this.inventorySlots ).simulation; + return ( (ContainerCraftConfirm) this.inventorySlots ).isSimulation(); } @Override public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { - final long BytesUsed = this.ccc.bytesUsed; + final long BytesUsed = this.ccc.getUsedBytes(); final String byteUsed = NumberFormat.getInstance().format( BytesUsed ); final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal(); this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " - " + Add, 8, 7, 4210752 ); @@ -217,7 +219,7 @@ public class GuiCraftConfirm extends AEBaseGui } else { - dsp = this.ccc.cpuBytesAvail > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.cpuBytesAvail + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.cpuCoProcessors ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; + dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; } final int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2; @@ -229,7 +231,7 @@ public class GuiCraftConfirm extends AEBaseGui int y = 0; final int xo = 9; final int yo = 22; - final int viewStart = this.myScrollBar.getCurrentScroll() * 3; + final int viewStart = this.getScrollBar().getCurrentScroll() * 3; final int viewEnd = viewStart + 3 * this.rows; String dspToolTip = ""; @@ -399,8 +401,8 @@ public class GuiCraftConfirm extends AEBaseGui { final int size = this.visual.size(); - this.myScrollBar.setTop( 19 ).setLeft( 218 ).setHeight( 114 ); - this.myScrollBar.setRange( 0, ( size + 2 ) / 3 - this.rows, 1 ); + this.getScrollBar().setTop( 19 ).setLeft( 218 ).setHeight( 114 ); + this.getScrollBar().setRange( 0, ( size + 2 ) / 3 - this.rows, 1 ); } public void postUpdate( final List list, final byte ref ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index f4f86233..c87d02ad 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -103,7 +103,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource this.craftingCpu = container; this.ySize = GUI_HEIGHT; this.xSize = GUI_WIDTH; - this.myScrollBar = new GuiScrollbar(); + + final GuiScrollbar scrollbar = new GuiScrollbar(); + this.setScrollBar( scrollbar ); } public void clearItems() @@ -145,8 +147,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource { final int size = this.visual.size(); - this.myScrollBar.setTop( SCROLLBAR_TOP ).setLeft( SCROLLBAR_LEFT ).setHeight( SCROLLBAR_HEIGHT ); - this.myScrollBar.setRange( 0, ( size + 2 ) / 3 - DISPLAYED_ROWS, 1 ); + this.getScrollBar().setTop( SCROLLBAR_TOP ).setLeft( SCROLLBAR_LEFT ).setHeight( SCROLLBAR_HEIGHT ); + this.getScrollBar().setRange( 0, ( size + 2 ) / 3 - DISPLAYED_ROWS, 1 ); } @Override @@ -193,9 +195,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource { String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() ); - if( this.craftingCpu.eta > 0 && !this.visual.isEmpty() ) + if( this.craftingCpu.getEstimatedTime() > 0 && !this.visual.isEmpty() ) { - final long etaInMilliseconds = TimeUnit.MILLISECONDS.convert( this.craftingCpu.eta, TimeUnit.NANOSECONDS ); + final long etaInMilliseconds = TimeUnit.MILLISECONDS.convert( this.craftingCpu.getEstimatedTime(), TimeUnit.NANOSECONDS ); final String etaTimeText = DurationFormatUtils.formatDuration( etaInMilliseconds, GuiText.ETAFormat.getLocal() ); title += " - " + etaTimeText; } @@ -204,7 +206,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource int x = 0; int y = 0; - final int viewStart = this.myScrollBar.getCurrentScroll() * 3; + final int viewStart = this.getScrollBar().getCurrentScroll() * 3; final int viewEnd = viewStart + 3 * 6; String dspToolTip = ""; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index a2db7e8e..b9a7a400 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -52,12 +52,12 @@ import appeng.parts.reporting.PartTerminal; public class GuiCraftingStatus extends GuiCraftingCPU { - final ContainerCraftingStatus status; - GuiButton selectCPU; + private final ContainerCraftingStatus status; + private GuiButton selectCPU; - GuiTabButton originalGuiBtn; - GuiBridge originalGui; - ItemStack myIcon = null; + private GuiTabButton originalGuiBtn; + private GuiBridge originalGui; + private ItemStack myIcon = null; public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { @@ -143,7 +143,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU if( this.myIcon != null ) { this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 213, this.guiTop - 4, this.myIcon, this.myIcon.getDisplayName(), itemRender ) ); - this.originalGuiBtn.hideEdge = 13; + this.originalGuiBtn.setHideEdge( 13 ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java index 6d0b9413..36a52eb0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java @@ -39,12 +39,12 @@ import appeng.helpers.InventoryAction; public class GuiCraftingTerm extends GuiMEMonitorable { - GuiImgButton clearBtn; + private GuiImgButton clearBtn; public GuiCraftingTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( inventoryPlayer, te, new ContainerCraftingTerm( inventoryPlayer, te ) ); - this.reservedSpace = 73; + this.setReservedSpace( 73 ); } @Override @@ -77,14 +77,14 @@ public class GuiCraftingTerm extends GuiMEMonitorable { super.initGui(); this.buttonList.add( this.clearBtn = new GuiImgButton( this.guiLeft + 92, this.guiTop + this.ySize - 156, Settings.ACTIONS, ActionItems.STASH ) ); - this.clearBtn.halfSize = true; + this.clearBtn.setHalfSize( true ); } @Override public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { super.drawFG( offsetX, offsetY, mouseX, mouseY ); - this.fontRendererObj.drawString( GuiText.CraftingTerminal.getLocal(), 8, this.ySize - 96 + 1 - this.reservedSpace, 4210752 ); + this.fontRendererObj.drawString( GuiText.CraftingTerminal.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 ); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiDrive.java b/src/main/java/appeng/client/gui/implementations/GuiDrive.java index b50bb947..d11801e2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiDrive.java +++ b/src/main/java/appeng/client/gui/implementations/GuiDrive.java @@ -35,7 +35,7 @@ import appeng.tile.storage.TileDrive; public class GuiDrive extends AEBaseGui { - GuiTabButton priority; + private GuiTabButton priority; public GuiDrive( final InventoryPlayer inventoryPlayer, final TileDrive te ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java index 347b7315..dcac54f2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java +++ b/src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java @@ -41,8 +41,8 @@ import appeng.parts.automation.PartFormationPlane; public class GuiFormationPlane extends GuiUpgradeable { - GuiTabButton priority; - GuiImgButton placeMode; + private GuiTabButton priority; + private GuiImgButton placeMode; public GuiFormationPlane( final InventoryPlayer inventoryPlayer, final PartFormationPlane te ) { @@ -70,12 +70,12 @@ public class GuiFormationPlane extends GuiUpgradeable if( this.fuzzyMode != null ) { - this.fuzzyMode.set( this.cvb.fzMode ); + this.fuzzyMode.set( this.cvb.getFuzzyMode() ); } if( this.placeMode != null ) { - this.placeMode.set( ( (ContainerFormationPlane) this.cvb ).placeMode ); + this.placeMode.set( ( (ContainerFormationPlane) this.cvb ).getPlaceMode() ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java index b0118adf..733a393b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiIOPort.java @@ -42,8 +42,8 @@ import appeng.tile.storage.TileIOPort; public class GuiIOPort extends GuiUpgradeable { - GuiImgButton fullMode; - GuiImgButton operationMode; + private GuiImgButton fullMode; + private GuiImgButton operationMode; public GuiIOPort( final InventoryPlayer inventoryPlayer, final TileIOPort te ) { @@ -71,17 +71,17 @@ public class GuiIOPort extends GuiUpgradeable if( this.redstoneMode != null ) { - this.redstoneMode.set( this.cvb.rsMode ); + this.redstoneMode.set( this.cvb.getRedStoneMode() ); } if( this.operationMode != null ) { - this.operationMode.set( ( (ContainerIOPort) this.cvb ).opMode ); + this.operationMode.set( ( (ContainerIOPort) this.cvb ).getOperationMode() ); } if( this.fullMode != null ) { - this.fullMode.set( ( (ContainerIOPort) this.cvb ).fMode ); + this.fullMode.set( ( (ContainerIOPort) this.cvb ).getFullMode() ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInscriber.java b/src/main/java/appeng/client/gui/implementations/GuiInscriber.java index 2d7e0a95..9144f147 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInscriber.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInscriber.java @@ -33,8 +33,8 @@ import appeng.tile.misc.TileInscriber; public class GuiInscriber extends AEBaseGui { - final ContainerInscriber cvc; - GuiProgressBar pb; + private final ContainerInscriber cvc; + private GuiProgressBar pb; public GuiInscriber( final InventoryPlayer inventoryPlayer, final TileInscriber te ) { @@ -44,7 +44,7 @@ public class GuiInscriber extends AEBaseGui this.xSize = this.hasToolbox() ? 246 : 211; } - protected boolean hasToolbox() + private boolean hasToolbox() { return ( (ContainerUpgradeable) this.inventorySlots ).hasToolbox(); } @@ -86,7 +86,7 @@ public class GuiInscriber extends AEBaseGui } } - protected boolean drawUpgrades() + private boolean drawUpgrades() { return true; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index ebe200ef..2efc5437 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -41,9 +41,9 @@ import appeng.helpers.IInterfaceHost; public class GuiInterface extends GuiUpgradeable { - GuiTabButton priority; - GuiImgButton BlockMode; - GuiToggleButton interfaceMode; + private GuiTabButton priority; + private GuiImgButton BlockMode; + private GuiToggleButton interfaceMode; public GuiInterface( final InventoryPlayer inventoryPlayer, final IInterfaceHost te ) { @@ -69,12 +69,12 @@ public class GuiInterface extends GuiUpgradeable { if( this.BlockMode != null ) { - this.BlockMode.set( ( (ContainerInterface) this.cvb ).bMode ); + this.BlockMode.set( ( (ContainerInterface) this.cvb ).getBlockingMode() ); } if( this.interfaceMode != null ) { - this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).iTermMode == YesNo.YES ); + this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).getInterfaceTerminalMode() == YesNo.YES ); } this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 5cd660e9..9b9f10c4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -55,7 +55,7 @@ public class GuiInterfaceTerminal extends AEBaseGui private static final int LINES_ON_PAGE = 6; // TODO: copied from GuiMEMonitorable. It looks not changed, maybe unneeded? - final int offsetX = 9; + private final int offsetX = 9; private final HashMap byId = new HashMap(); private final HashMultimap byName = HashMultimap.create(); @@ -70,7 +70,9 @@ public class GuiInterfaceTerminal extends AEBaseGui public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te ) { super( new ContainerInterfaceTerminal( inventoryPlayer, te ) ); - this.myScrollBar = new GuiScrollbar(); + + final GuiScrollbar scrollbar = new GuiScrollbar(); + this.setScrollBar( scrollbar ); this.xSize = 195; this.ySize = 222; } @@ -80,9 +82,9 @@ public class GuiInterfaceTerminal extends AEBaseGui { super.initGui(); - this.myScrollBar.setLeft( 175 ); - this.myScrollBar.setHeight( 106 ); - this.myScrollBar.setTop( 18 ); + this.getScrollBar().setLeft( 175 ); + this.getScrollBar().setHeight( 106 ); + this.getScrollBar().setTop( 18 ); this.searchField = new MEGuiTextField( this.fontRendererObj, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 ); this.searchField.setEnableBackgroundDrawing( false ); @@ -98,7 +100,7 @@ public class GuiInterfaceTerminal extends AEBaseGui this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); - final int ex = this.myScrollBar.getCurrentScroll(); + final int ex = this.getScrollBar().getCurrentScroll(); final Iterator o = this.inventorySlots.inventorySlots.iterator(); while( o.hasNext() ) @@ -116,7 +118,7 @@ public class GuiInterfaceTerminal extends AEBaseGui if( lineObj instanceof ClientDCInternalInv ) { final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj; - for( int z = 0; z < inv.inv.getSizeInventory(); z++ ) + for( int z = 0; z < inv.getInventory().getSizeInventory(); z++ ) { this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) ); } @@ -162,7 +164,7 @@ public class GuiInterfaceTerminal extends AEBaseGui this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize ); int offset = 17; - final int ex = this.myScrollBar.getCurrentScroll(); + final int ex = this.getScrollBar().getCurrentScroll(); for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ ) { @@ -172,7 +174,7 @@ public class GuiInterfaceTerminal extends AEBaseGui final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj; GL11.glColor4f( 1, 1, 1, 1 ); - final int width = inv.inv.getSizeInventory() * 18; + final int width = inv.getInventory().getSizeInventory() * 18; this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 ); } offset += 18; @@ -224,12 +226,12 @@ public class GuiInterfaceTerminal extends AEBaseGui final NBTTagCompound invData = in.getCompoundTag( key ); final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) ); - for( int x = 0; x < current.inv.getSizeInventory(); x++ ) + for( int x = 0; x < current.getInventory().getSizeInventory(); x++ ) { final String which = Integer.toString( x ); if( invData.hasKey( which ) ) { - current.inv.setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) ); + current.getInventory().setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) ); } } } @@ -276,7 +278,7 @@ public class GuiInterfaceTerminal extends AEBaseGui // Search if the current inventory holds a pattern containing the search term. if( !found && !searchFilterLowerCase.isEmpty() ) { - for( final ItemStack itemStack : entry.inv ) + for( final ItemStack itemStack : entry.getInventory() ) { found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase ); if( found ) @@ -317,7 +319,7 @@ public class GuiInterfaceTerminal extends AEBaseGui this.lines.addAll( clientInventories ); } - this.myScrollBar.setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 ); + this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 ); } private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java index bb5bdd7a..afa81df9 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java +++ b/src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java @@ -47,19 +47,19 @@ import appeng.parts.automation.PartLevelEmitter; public class GuiLevelEmitter extends GuiUpgradeable { - GuiNumberBox level; + private GuiNumberBox level; - GuiButton plus1; - GuiButton plus10; - GuiButton plus100; - GuiButton plus1000; - GuiButton minus1; - GuiButton minus10; - GuiButton minus100; - GuiButton minus1000; + private GuiButton plus1; + private GuiButton plus10; + private GuiButton plus100; + private GuiButton plus1000; + private GuiButton minus1; + private GuiButton minus10; + private GuiButton minus100; + private GuiButton minus1000; - GuiImgButton levelMode; - GuiImgButton craftingMode; + private GuiImgButton levelMode; + private GuiImgButton craftingMode; public GuiLevelEmitter( final InventoryPlayer inventoryPlayer, final PartLevelEmitter te ) { @@ -131,12 +131,12 @@ public class GuiLevelEmitter extends GuiUpgradeable if( this.craftingMode != null ) { - this.craftingMode.set( ( (ContainerLevelEmitter) this.cvb ).cmType ); + this.craftingMode.set( ( (ContainerLevelEmitter) this.cvb ).getCraftingMode() ); } if( this.levelMode != null ) { - this.levelMode.set( ( (ContainerLevelEmitter) this.cvb ).lvType ); + this.levelMode.set( ( (ContainerLevelEmitter) this.cvb ).getLevelMode() ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiMAC.java b/src/main/java/appeng/client/gui/implementations/GuiMAC.java index bbf733a1..bf216855 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMAC.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMAC.java @@ -34,8 +34,8 @@ import appeng.tile.crafting.TileMolecularAssembler; public class GuiMAC extends GuiUpgradeable { - final ContainerMAC container; - GuiProgressBar pb; + private final ContainerMAC container; + private GuiProgressBar pb; public GuiMAC( final InventoryPlayer inventoryPlayer, final TileMolecularAssembler te ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index ebf99710..d65a54e2 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -71,30 +71,31 @@ import appeng.util.Platform; public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfigManagerHost { - public static int CraftingGridOffsetX; - public static int CraftingGridOffsetY; + public static int craftingGridOffsetX; + public static int craftingGridOffsetY; + private static String memoryText = ""; - final ItemRepo repo; - final int offsetX = 9; - final int lowerTextureOffset = 0; - final IConfigManager configSrc; - final boolean viewCell; - final ItemStack[] myCurrentViewCells = new ItemStack[5]; - final ContainerMEMonitorable monitorableContainer; - GuiTabButton craftingStatusBtn; - MEGuiTextField searchField; - GuiText myName; - int perRow = 9; - int reservedSpace = 0; - boolean customSortOrder = true; - int rows = 0; - int maxRows = Integer.MAX_VALUE; - int standardSize; - GuiImgButton ViewBox; - GuiImgButton SortByBox; - GuiImgButton SortDirBox; - GuiImgButton searchBoxSettings; - GuiImgButton terminalStyleBox; + private final ItemRepo repo; + private final int offsetX = 9; + private final int lowerTextureOffset = 0; + private final IConfigManager configSrc; + private final boolean viewCell; + private final ItemStack[] myCurrentViewCells = new ItemStack[5]; + private final ContainerMEMonitorable monitorableContainer; + private GuiTabButton craftingStatusBtn; + private MEGuiTextField searchField; + private GuiText myName; + private int perRow = 9; + private int reservedSpace = 0; + private boolean customSortOrder = true; + private int rows = 0; + private int maxRows = Integer.MAX_VALUE; + private int standardSize; + private GuiImgButton ViewBox; + private GuiImgButton SortByBox; + private GuiImgButton SortDirBox; + private GuiImgButton searchBoxSettings; + private GuiImgButton terminalStyleBox; public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { @@ -105,8 +106,10 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi { super( c ); - this.myScrollBar = new GuiScrollbar(); - this.repo = new ItemRepo( this.myScrollBar, this ); + + final GuiScrollbar scrollbar = new GuiScrollbar(); + this.setScrollBar( scrollbar ); + this.repo = new ItemRepo( scrollbar, this ); this.xSize = 185; this.ySize = 204; @@ -119,7 +122,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.standardSize = this.xSize; this.configSrc = ( (IConfigurableObject) this.inventorySlots ).getConfigManager(); - ( this.monitorableContainer = (ContainerMEMonitorable) this.inventorySlots ).gui = this; + ( this.monitorableContainer = (ContainerMEMonitorable) this.inventorySlots ).setGui( this ); this.viewCell = te instanceof IViewCellStorage; @@ -158,8 +161,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi private void setScrollBar() { - this.myScrollBar.setTop( 18 ).setLeft( 175 ).setHeight( this.rows * 18 - 2 ); - this.myScrollBar.setRange( 0, ( this.repo.size() + this.perRow - 1 ) / this.perRow - this.rows, Math.max( 1, this.rows / 6 ) ); + this.getScrollBar().setTop( 18 ).setLeft( 175 ).setHeight( this.rows * 18 - 2 ); + this.getScrollBar().setRange( 0, ( this.repo.size() + this.perRow - 1 ) / this.perRow - this.rows, Math.max( 1, this.rows / 6 ) ); } @Override @@ -204,13 +207,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class ) { - this.re_init(); + this.reinitalize(); } } } } - public void re_init() + private void reinitalize() { this.buttonList.clear(); this.initGui(); @@ -249,12 +252,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.rows = 3; } - this.meSlots.clear(); + this.getMeSlots().clear(); for( int y = 0; y < this.rows; y++ ) { for( int x = 0; x < this.perRow; x++ ) { - this.meSlots.add( new InternalSlotME( this.repo, x + y * this.perRow, this.offsetX + x * 18, 18 + y * 18 ) ); + this.getMeSlots().add( new InternalSlotME( this.repo, x + y * this.perRow, this.offsetX + x * 18, 18 + y * 18 ) ); } } @@ -311,7 +314,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.viewCell || this instanceof GuiWirelessTerm ) { this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( this.guiLeft + 170, this.guiTop - 4, 2 + 11 * 16, GuiText.CraftingStatus.getLocal(), itemRender ) ); - this.craftingStatusBtn.hideEdge = 13; + this.craftingStatusBtn.setHideEdge( 13 ); } // Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH ); @@ -321,13 +324,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.isSubGui() ) { this.searchField.setText( memoryText ); - this.repo.searchString = memoryText; + this.repo.setSearchString( memoryText ); this.repo.updateView(); this.setScrollBar(); } - CraftingGridOffsetX = Integer.MAX_VALUE; - CraftingGridOffsetY = Integer.MAX_VALUE; + craftingGridOffsetX = Integer.MAX_VALUE; + craftingGridOffsetY = Integer.MAX_VALUE; for( final Object s : this.inventorySlots.inventorySlots ) { @@ -344,14 +347,14 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi final Slot g = (Slot) s; if( g.xDisplayPosition > 0 && g.yDisplayPosition > 0 ) { - CraftingGridOffsetX = Math.min( CraftingGridOffsetX, g.xDisplayPosition ); - CraftingGridOffsetY = Math.min( CraftingGridOffsetY, g.yDisplayPosition ); + craftingGridOffsetX = Math.min( craftingGridOffsetX, g.xDisplayPosition ); + craftingGridOffsetY = Math.min( craftingGridOffsetY, g.yDisplayPosition ); } } } - CraftingGridOffsetX -= 25; - CraftingGridOffsetY -= 6; + craftingGridOffsetX -= 25; + craftingGridOffsetY -= 6; } @Override @@ -374,7 +377,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( btn == 1 && this.searchField.isMouseIn( xCoord, yCoord ) ) { this.searchField.setText( "" ); - this.repo.searchString = ""; + this.repo.setSearchString( "" ); this.repo.updateView(); this.setScrollBar(); } @@ -416,10 +419,10 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi for( int i = 0; i < 5; i++ ) { - if( this.myCurrentViewCells[i] != this.monitorableContainer.cellView[i].getStack() ) + if( this.myCurrentViewCells[i] != this.monitorableContainer.getCellViewSlot( i ).getStack() ) { update = true; - this.myCurrentViewCells[i] = this.monitorableContainer.cellView[i].getStack(); + this.myCurrentViewCells[i] = this.monitorableContainer.getCellViewSlot( i ).getStack(); } } @@ -453,7 +456,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi protected void repositionSlot( final AppEngSlot s ) { - s.yDisplayPosition = s.defY + this.ySize - 78 - 5; + s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; } @Override @@ -468,7 +471,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi if( this.searchField.textboxKeyTyped( character, key ) ) { - this.repo.searchString = this.searchField.getText(); + this.repo.setSearchString( this.searchField.getText() ); this.repo.updateView(); this.setScrollBar(); } @@ -482,7 +485,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi @Override public void updateScreen() { - this.repo.setPower( this.monitorableContainer.hasPower ); + this.repo.setPower( this.monitorableContainer.isPowered() ); super.updateScreen(); } @@ -524,4 +527,34 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi this.repo.updateView(); } + + int getReservedSpace() + { + return this.reservedSpace; + } + + void setReservedSpace( final int reservedSpace ) + { + this.reservedSpace = reservedSpace; + } + + public boolean isCustomSortOrder() + { + return this.customSortOrder; + } + + void setCustomSortOrder( final boolean customSortOrder ) + { + this.customSortOrder = customSortOrder; + } + + public int getStandardSize() + { + return this.standardSize; + } + + void setStandardSize( final int standardSize ) + { + this.standardSize = standardSize; + } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java index 1a986214..b7cca616 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java @@ -50,19 +50,21 @@ import appeng.util.Platform; public class GuiNetworkStatus extends AEBaseGui implements ISortSource { - final ItemRepo repo; - final int rows = 4; - GuiImgButton units; - int tooltip = -1; + private final ItemRepo repo; + private final int rows = 4; + private GuiImgButton units; + private int tooltip = -1; public GuiNetworkStatus( final InventoryPlayer inventoryPlayer, final INetworkTool te ) { super( new ContainerNetworkStatus( inventoryPlayer, te ) ); + final GuiScrollbar scrollbar = new GuiScrollbar(); + + this.setScrollBar( scrollbar ); + this.repo = new ItemRepo( scrollbar, this ); this.ySize = 153; this.xSize = 195; - this.myScrollBar = new GuiScrollbar(); - this.repo = new ItemRepo( this.myScrollBar, this ); - this.repo.rowSize = 5; + this.repo.setRowSize( 5 ); } @Override @@ -132,11 +134,11 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource this.fontRendererObj.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 ); - this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( ns.currentPower, false ), 13, 16, 4210752 ); - this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( ns.maxPower, false ), 13, 26, 4210752 ); + this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( ns.getCurrentPower(), false ), 13, 16, 4210752 ); + this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( ns.getMaxPower(), false ), 13, 26, 4210752 ); - this.fontRendererObj.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.avgAddition, true ), 13, 143 - 10, 4210752 ); - this.fontRendererObj.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.powerUsage, true ), 13, 143 - 20, 4210752 ); + this.fontRendererObj.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.getAverageAddition(), true ), 13, 143 - 10, 4210752 ); + this.fontRendererObj.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.getPowerUsage(), true ), 13, 143 - 20, 4210752 ); final int sectionLength = 30; @@ -229,8 +231,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource private void setScrollBar() { final int size = this.repo.size(); - this.myScrollBar.setTop( 39 ).setLeft( 175 ).setHeight( 78 ); - this.myScrollBar.setRange( 0, ( size + 4 ) / 5 - this.rows, 1 ); + this.getScrollBar().setTop( 39 ).setLeft( 175 ).setHeight( 78 ); + this.getScrollBar().setRange( 0, ( size + 4 ) / 5 - this.rows, 1 ); } // @Override - NEI diff --git a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java index 4012e535..3b2ba00b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java +++ b/src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java @@ -37,7 +37,7 @@ import appeng.core.sync.packets.PacketValueConfig; public class GuiNetworkTool extends AEBaseGui { - GuiToggleButton tFacades; + private GuiToggleButton tFacades; public GuiNetworkTool( final InventoryPlayer inventoryPlayer, final INetworkTool te ) { @@ -78,7 +78,7 @@ public class GuiNetworkTool extends AEBaseGui { if( this.tFacades != null ) { - this.tFacades.setState( ( (ContainerNetworkTool) this.inventorySlots ).facadeMode ); + this.tFacades.setState( ( (ContainerNetworkTool) this.inventorySlots ).isFacadeMode() ); } this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.NetworkTool.getLocal() ), 8, 6, 4210752 ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 0efc688d..ff08dc47 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -61,7 +61,7 @@ public class GuiPatternTerm extends GuiMEMonitorable { super( inventoryPlayer, te, new ContainerPatternTerm( inventoryPlayer, te ) ); this.container = (ContainerPatternTerm) this.inventorySlots; - this.reservedSpace = 81; + this.setReservedSpace( 81 ); } @Override @@ -110,15 +110,15 @@ public class GuiPatternTerm extends GuiMEMonitorable this.buttonList.add( this.tabProcessButton ); this.substitutionsEnabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.ENABLED ); - this.substitutionsEnabledBtn.halfSize = true; + this.substitutionsEnabledBtn.setHalfSize( true ); this.buttonList.add( this.substitutionsEnabledBtn ); this.substitutionsDisabledBtn = new GuiImgButton( this.guiLeft + 84, this.guiTop + this.ySize - 163, Settings.ACTIONS, ItemSubstitution.DISABLED ); - this.substitutionsDisabledBtn.halfSize = true; + this.substitutionsDisabledBtn.setHalfSize( true ); this.buttonList.add( this.substitutionsDisabledBtn ); this.clearBtn = new GuiImgButton( this.guiLeft + 74, this.guiTop + this.ySize - 163, Settings.ACTIONS, ActionItems.CLOSE ); - this.clearBtn.halfSize = true; + this.clearBtn.setHalfSize( true ); this.buttonList.add( this.clearBtn ); this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE ); @@ -128,7 +128,7 @@ public class GuiPatternTerm extends GuiMEMonitorable @Override public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { - if( !this.container.craftingMode ) + if( !this.container.isCraftingMode() ) { this.tabCraftButton.visible = false; this.tabProcessButton.visible = true; @@ -151,13 +151,13 @@ public class GuiPatternTerm extends GuiMEMonitorable } super.drawFG( offsetX, offsetY, mouseX, mouseY ); - this.fontRendererObj.drawString( GuiText.PatternTerminal.getLocal(), 8, this.ySize - 96 + 2 - this.reservedSpace, 4210752 ); + this.fontRendererObj.drawString( GuiText.PatternTerminal.getLocal(), 8, this.ySize - 96 + 2 - this.getReservedSpace(), 4210752 ); } @Override protected String getBackground() { - if( this.container.craftingMode ) + if( this.container.isCraftingMode() ) { return "guis/pattern.png"; } @@ -169,11 +169,11 @@ public class GuiPatternTerm extends GuiMEMonitorable { if( s.isPlayerSide() ) { - s.yDisplayPosition = s.defY + this.ySize - 78 - 5; + s.yDisplayPosition = s.getY() + this.ySize - 78 - 5; } else { - s.yDisplayPosition = s.defY + this.ySize - 78 - 3; + s.yDisplayPosition = s.getY() + this.ySize - 78 - 3; } } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiPriority.java b/src/main/java/appeng/client/gui/implementations/GuiPriority.java index 2c3df6c0..95ab6832 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPriority.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPriority.java @@ -53,19 +53,19 @@ import appeng.tile.storage.TileDrive; public class GuiPriority extends AEBaseGui { - GuiNumberBox priority; - GuiTabButton originalGuiBtn; + private GuiNumberBox priority; + private GuiTabButton originalGuiBtn; - GuiButton plus1; - GuiButton plus10; - GuiButton plus100; - GuiButton plus1000; - GuiButton minus1; - GuiButton minus10; - GuiButton minus100; - GuiButton minus1000; + private GuiButton plus1; + private GuiButton plus10; + private GuiButton plus100; + private GuiButton plus1000; + private GuiButton minus1; + private GuiButton minus10; + private GuiButton minus100; + private GuiButton minus1000; - GuiBridge OriginalGui; + private GuiBridge OriginalGui; public GuiPriority( final InventoryPlayer inventoryPlayer, final IPriorityHost te ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java index defb9345..ed49f06d 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java +++ b/src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java @@ -36,7 +36,7 @@ import appeng.items.contents.QuartzKnifeObj; public class GuiQuartzKnife extends AEBaseGui { - GuiTextField name; + private GuiTextField name; public GuiQuartzKnife( final InventoryPlayer inventoryPlayer, final QuartzKnifeObj te ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java index befa6b54..d2c8f8c4 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSecurity.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSecurity.java @@ -37,21 +37,21 @@ import appeng.core.sync.packets.PacketValueConfig; public class GuiSecurity extends GuiMEMonitorable { - GuiToggleButton inject; - GuiToggleButton extract; - GuiToggleButton craft; - GuiToggleButton build; - GuiToggleButton security; + private GuiToggleButton inject; + private GuiToggleButton extract; + private GuiToggleButton craft; + private GuiToggleButton build; + private GuiToggleButton security; public GuiSecurity( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) ); - this.customSortOrder = false; - this.reservedSpace = 33; + this.setCustomSortOrder( false ); + this.setReservedSpace( 33 ); // increase size so that the slot is over the gui. this.xSize += 56; - this.standardSize = this.xSize; + this.setStandardSize( this.xSize ); } @Override @@ -116,7 +116,7 @@ public class GuiSecurity extends GuiMEMonitorable public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { super.drawFG( offsetX, offsetY, mouseX, mouseY ); - this.fontRendererObj.drawString( GuiText.SecurityCardEditor.getLocal(), 8, this.ySize - 96 + 1 - this.reservedSpace, 4210752 ); + this.fontRendererObj.drawString( GuiText.SecurityCardEditor.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 ); } @Override @@ -124,11 +124,11 @@ public class GuiSecurity extends GuiMEMonitorable { final ContainerSecurity cs = (ContainerSecurity) this.inventorySlots; - this.inject.setState( ( cs.security & ( 1 << SecurityPermissions.INJECT.ordinal() ) ) > 0 ); - this.extract.setState( ( cs.security & ( 1 << SecurityPermissions.EXTRACT.ordinal() ) ) > 0 ); - this.craft.setState( ( cs.security & ( 1 << SecurityPermissions.CRAFT.ordinal() ) ) > 0 ); - this.build.setState( ( cs.security & ( 1 << SecurityPermissions.BUILD.ordinal() ) ) > 0 ); - this.security.setState( ( cs.security & ( 1 << SecurityPermissions.SECURITY.ordinal() ) ) > 0 ); + this.inject.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.INJECT.ordinal() ) ) > 0 ); + this.extract.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.EXTRACT.ordinal() ) ) > 0 ); + this.craft.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.CRAFT.ordinal() ) ) > 0 ); + this.build.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.BUILD.ordinal() ) ) > 0 ); + this.security.setState( ( cs.getPermissionMode() & ( 1 << SecurityPermissions.SECURITY.ordinal() ) ) > 0 ); return "guis/security.png"; } diff --git a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java index ec0a4327..c3746e1e 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java +++ b/src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java @@ -37,8 +37,8 @@ import appeng.util.Platform; public class GuiSpatialIOPort extends AEBaseGui { - final ContainerSpatialIOPort container; - GuiImgButton units; + private final ContainerSpatialIOPort container; + private GuiImgButton units; public GuiSpatialIOPort( final InventoryPlayer inventoryPlayer, final TileSpatialIOPort te ) { @@ -73,10 +73,10 @@ public class GuiSpatialIOPort extends AEBaseGui @Override public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { - this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.currentPower, false ), 13, 21, 4210752 ); - this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.maxPower, false ), 13, 31, 4210752 ); - this.fontRendererObj.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.reqPower, false ), 13, 78, 4210752 ); - this.fontRendererObj.drawString( GuiText.Efficiency.getLocal() + ": " + ( ( (float) this.container.eff ) / 100 ) + '%', 13, 88, 4210752 ); + this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getCurrentPower(), false ), 13, 21, 4210752 ); + this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getMaxPower(), false ), 13, 31, 4210752 ); + this.fontRendererObj.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getRequiredPower(), false ), 13, 78, 4210752 ); + this.fontRendererObj.drawString( GuiText.Efficiency.getLocal() + ": " + ( ( (float) this.container.getEfficency() ) / 100 ) + '%', 13, 88, 4210752 ); this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.SpatialIOPort.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96, 4210752 ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index b276a0cb..a3fa6d65 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -47,11 +47,11 @@ import appeng.parts.misc.PartStorageBus; public class GuiStorageBus extends GuiUpgradeable { - GuiImgButton rwMode; - GuiImgButton storageFilter; - GuiTabButton priority; - GuiImgButton partition; - GuiImgButton clear; + private GuiImgButton rwMode; + private GuiImgButton storageFilter; + private GuiTabButton priority; + private GuiImgButton partition; + private GuiImgButton clear; public GuiStorageBus( final InventoryPlayer inventoryPlayer, final PartStorageBus te ) { @@ -85,17 +85,17 @@ public class GuiStorageBus extends GuiUpgradeable if( this.fuzzyMode != null ) { - this.fuzzyMode.set( this.cvb.fzMode ); + this.fuzzyMode.set( this.cvb.getFuzzyMode() ); } if( this.storageFilter != null ) { - this.storageFilter.set( ( (ContainerStorageBus) this.cvb ).storageFilter ); + this.storageFilter.set( ( (ContainerStorageBus) this.cvb ).getStorageFilter() ); } if( this.rwMode != null ) { - this.rwMode.set( ( (ContainerStorageBus) this.cvb ).rwMode ); + this.rwMode.set( ( (ContainerStorageBus) this.cvb ).getReadWriteMode() ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java index 510f9d69..9c728f74 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java @@ -44,13 +44,13 @@ import appeng.parts.automation.PartImportBus; public class GuiUpgradeable extends AEBaseGui { - final ContainerUpgradeable cvb; - final IUpgradeableHost bc; + protected final ContainerUpgradeable cvb; + protected final IUpgradeableHost bc; - GuiImgButton redstoneMode; - GuiImgButton fuzzyMode; - GuiImgButton craftMode; - GuiImgButton schedulingMode; + protected GuiImgButton redstoneMode; + protected GuiImgButton fuzzyMode; + protected GuiImgButton craftMode; + protected GuiImgButton schedulingMode; public GuiUpgradeable( final InventoryPlayer inventoryPlayer, final IUpgradeableHost te ) { @@ -100,22 +100,22 @@ public class GuiUpgradeable extends AEBaseGui if( this.redstoneMode != null ) { - this.redstoneMode.set( this.cvb.rsMode ); + this.redstoneMode.set( this.cvb.getRedStoneMode() ); } if( this.fuzzyMode != null ) { - this.fuzzyMode.set( this.cvb.fzMode ); + this.fuzzyMode.set( this.cvb.getFuzzyMode() ); } if( this.craftMode != null ) { - this.craftMode.set( this.cvb.cMode ); + this.craftMode.set( this.cvb.getCraftingMode() ); } if( this.schedulingMode != null ) { - this.schedulingMode.set( this.cvb.schedulingMode ); + this.schedulingMode.set( this.cvb.getSchedulingMode() ); } } diff --git a/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java b/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java index b63c86ba..b9959d44 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java +++ b/src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java @@ -34,8 +34,8 @@ import appeng.tile.misc.TileVibrationChamber; public class GuiVibrationChamber extends AEBaseGui { - final ContainerVibrationChamber cvc; - GuiProgressBar pb; + private final ContainerVibrationChamber cvc; + private GuiProgressBar pb; public GuiVibrationChamber( final InventoryPlayer inventoryPlayer, final TileVibrationChamber te ) { @@ -59,7 +59,7 @@ public class GuiVibrationChamber extends AEBaseGui this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); - this.pb.setFullMsg( this.cvc.aePerTick * this.cvc.getCurrentProgress() / 100 + " AE/t" ); + this.pb.setFullMsg( this.cvc.getAePerTick() * this.cvc.getCurrentProgress() / 100 + " AE/t" ); if( this.cvc.getCurrentProgress() > 0 ) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiWireless.java b/src/main/java/appeng/client/gui/implementations/GuiWireless.java index f389a815..16128b94 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWireless.java +++ b/src/main/java/appeng/client/gui/implementations/GuiWireless.java @@ -37,7 +37,7 @@ import appeng.util.Platform; public class GuiWireless extends AEBaseGui { - GuiImgButton units; + private GuiImgButton units; public GuiWireless( final InventoryPlayer inventoryPlayer, final TileWireless te ) { @@ -76,10 +76,10 @@ public class GuiWireless extends AEBaseGui final ContainerWireless cw = (ContainerWireless) this.inventorySlots; - if( cw.range > 0 ) + if( cw.getRange() > 0 ) { - final String firstMessage = GuiText.Range.getLocal() + ": " + ( cw.range / 10.0 ) + " m"; - final String secondMessage = GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( cw.drain, true ); + final String firstMessage = GuiText.Range.getLocal() + ": " + ( cw.getRange() / 10.0 ) + " m"; + final String secondMessage = GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( cw.getDrain(), true ); final int strWidth = Math.max( this.fontRendererObj.getStringWidth( firstMessage ), this.fontRendererObj.getStringWidth( secondMessage ) ); final int cOffset = ( this.xSize / 2 ) - ( strWidth / 2 ); diff --git a/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java b/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java index b994a32d..f5dba6c0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java @@ -30,7 +30,6 @@ public class GuiWirelessTerm extends GuiMEPortableCell public GuiWirelessTerm( final InventoryPlayer inventoryPlayer, final IPortableCell te ) { super( inventoryPlayer, te ); - this.maxRows = Integer.MAX_VALUE; } @Override diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 529c3142..159cf708 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -59,8 +59,8 @@ public class GuiImgButton extends GuiButton implements ITooltip private static final Pattern PATTERN_NEW_LINE = Pattern.compile( "\\n", Pattern.LITERAL ); private static Map appearances; private final Enum buttonSetting; - public boolean halfSize = false; - public String fillVar; + private boolean halfSize = false; + private String fillVar; private Enum currentValue; public GuiImgButton( final int x, final int y, final Enum idx, final Enum val ) @@ -362,7 +362,27 @@ public class GuiImgButton extends GuiButton implements ITooltip } } - static class EnumPair + public boolean isHalfSize() + { + return this.halfSize; + } + + public void setHalfSize( final boolean halfSize ) + { + this.halfSize = halfSize; + } + + public String getFillVar() + { + return this.fillVar; + } + + public void setFillVar( final String fillVar ) + { + this.fillVar = fillVar; + } + + private static final class EnumPair { final Enum setting; diff --git a/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java b/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java index 95777025..53902366 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java +++ b/src/main/java/appeng/client/gui/widgets/GuiNumberBox.java @@ -26,7 +26,7 @@ import net.minecraft.client.gui.GuiTextField; public class GuiNumberBox extends GuiTextField { - final Class type; + private final Class type; public GuiNumberBox( final FontRenderer fontRenderer, final int x, final int y, final int width, final int height, final Class type ) { diff --git a/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java b/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java index 6de88922..9ac472f4 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java +++ b/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java @@ -53,7 +53,7 @@ public class GuiScrollbar implements IScrollSource } } - public int getRange() + private int getRange() { return this.maxScroll - this.minScroll; } diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index 8a50c8da..1c444ad2 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -36,7 +36,7 @@ public class GuiTabButton extends GuiButton implements ITooltip { private final RenderItem itemRenderer; private final String message; - public int hideEdge = 0; + private int hideEdge = 0; private int myIcon = -1; private ItemStack myItem; @@ -152,4 +152,14 @@ public class GuiTabButton extends GuiButton implements ITooltip { return this.visible; } + + public int getHideEdge() + { + return this.hideEdge; + } + + public void setHideEdge( final int hideEdge ) + { + this.hideEdge = hideEdge; + } } diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java index a34a0bdd..11e2ddbf 100644 --- a/src/main/java/appeng/client/me/ClientDCInternalInv.java +++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java @@ -30,14 +30,15 @@ import appeng.util.ItemSorters; public class ClientDCInternalInv implements Comparable { - public final String unlocalizedName; - public final AppEngInternalInventory inv; - public final long id; - public final long sortBy; + private final String unlocalizedName; + private final AppEngInternalInventory inventory; + + private final long id; + private final long sortBy; public ClientDCInternalInv( final int size, final long id, final long sortBy, final String unlocalizedName ) { - this.inv = new AppEngInternalInventory( null, size ); + this.inventory = new AppEngInternalInventory( null, size ); this.unlocalizedName = unlocalizedName; this.id = id; this.sortBy = sortBy; @@ -58,4 +59,14 @@ public class ClientDCInternalInv implements Comparable { return ItemSorters.compareLong( this.sortBy, o.sortBy ); } + + public AppEngInternalInventory getInventory() + { + return this.inventory; + } + + public long getId() + { + return this.id; + } } \ No newline at end of file diff --git a/src/main/java/appeng/client/me/InternalSlotME.java b/src/main/java/appeng/client/me/InternalSlotME.java index ec153edf..90b72c2f 100644 --- a/src/main/java/appeng/client/me/InternalSlotME.java +++ b/src/main/java/appeng/client/me/InternalSlotME.java @@ -27,9 +27,9 @@ import appeng.api.storage.data.IAEItemStack; public class InternalSlotME { - public final int offset; - public final int xPos; - public final int yPos; + private final int offset; + private final int xPos; + private final int yPos; private final ItemRepo repo; public InternalSlotME( final ItemRepo def, final int offset, final int displayX, final int displayY ) @@ -40,18 +40,28 @@ public class InternalSlotME this.yPos = displayY; } - public ItemStack getStack() + ItemStack getStack() { return this.repo.getItem( this.offset ); } - public IAEItemStack getAEStack() + IAEItemStack getAEStack() { return this.repo.getReferenceItem( this.offset ); } - public boolean hasPower() + boolean hasPower() { return this.repo.hasPower(); } + + int getxPosition() + { + return this.xPos; + } + + int getyPosition() + { + return this.yPos; + } } diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 7e539881..5be6c821 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -25,6 +25,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.regex.Pattern; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -55,10 +57,10 @@ public class ItemRepo private final IScrollSource src; private final ISortSource sortSrc; - public int rowSize = 9; + private int rowSize = 9; - public String searchString = ""; - IPartitionList myPartitionList; + private String searchString = ""; + private IPartitionList myPartitionList; private String innerSearch = ""; private String NEIWord = null; private boolean hasPower; @@ -218,7 +220,7 @@ public class ItemRepo final Enum SortBy = this.sortSrc.getSortBy(); final Enum SortDir = this.sortSrc.getSortDir(); - ItemSorters.Direction = (appeng.api.config.SortDir) SortDir; + ItemSorters.setDirection( (appeng.api.config.SortDir) SortDir ); ItemSorters.init(); if( SortBy == SortOrder.MOD ) @@ -287,4 +289,24 @@ public class ItemRepo { this.hasPower = hasPower; } + + public int getRowSize() + { + return this.rowSize; + } + + public void setRowSize( final int rowSize ) + { + this.rowSize = rowSize; + } + + public String getSearchString() + { + return this.searchString; + } + + public void setSearchString( @Nonnull final String searchString ) + { + this.searchString = searchString; + } } diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index ffbb11c2..e43b401d 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -31,11 +31,11 @@ import appeng.util.Platform; public class SlotDisconnected extends AppEngSlot { - public final ClientDCInternalInv mySlot; + private final ClientDCInternalInv mySlot; public SlotDisconnected( final ClientDCInternalInv me, final int which, final int x, final int y ) { - super( me.inv, which, x, y ); + super( me.getInventory(), which, x, y ); this.mySlot = me; } @@ -104,4 +104,9 @@ public class SlotDisconnected extends AppEngSlot { return false; } + + public ClientDCInternalInv getSlot() + { + return this.mySlot; + } } diff --git a/src/main/java/appeng/client/me/SlotME.java b/src/main/java/appeng/client/me/SlotME.java index bff8d7f0..d4de3ed3 100644 --- a/src/main/java/appeng/client/me/SlotME.java +++ b/src/main/java/appeng/client/me/SlotME.java @@ -30,11 +30,11 @@ import appeng.api.storage.data.IAEItemStack; public class SlotME extends Slot { - public final InternalSlotME mySlot; + private final InternalSlotME mySlot; public SlotME( final InternalSlotME me ) { - super( null, 0, me.xPos, me.yPos ); + super( null, 0, me.getxPosition(), me.getyPosition() ); this.mySlot = me; } diff --git a/src/main/java/appeng/client/render/AppEngRenderItem.java b/src/main/java/appeng/client/render/AppEngRenderItem.java index a827fcc2..c9177c28 100644 --- a/src/main/java/appeng/client/render/AppEngRenderItem.java +++ b/src/main/java/appeng/client/render/AppEngRenderItem.java @@ -19,6 +19,8 @@ package appeng.client.render; +import javax.annotation.Nonnull; + import org.lwjgl.opengl.GL11; import net.minecraft.client.gui.FontRenderer; @@ -46,7 +48,7 @@ public class AppEngRenderItem extends RenderItem private static final ISlimReadableNumberConverter SLIM_CONVERTER = ReadableNumberConverter.INSTANCE; private static final IWideReadableNumberConverter WIDE_CONVERTER = ReadableNumberConverter.INSTANCE; - public IAEItemStack aeStack; + private IAEItemStack aeStack = null; @Override public void renderItemOverlayIntoGUI( final FontRenderer fontRenderer, final TextureManager textureManager, final ItemStack is, final int par4, final int par5, final String par6Str ) @@ -141,4 +143,14 @@ public class AppEngRenderItem extends RenderItem return WIDE_CONVERTER.toWideReadableForm( originalSize ); } } + + public IAEItemStack getAeStack() + { + return this.aeStack; + } + + public void setAeStack( @Nonnull final IAEItemStack aeStack ) + { + this.aeStack = aeStack; + } } diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 023cc6e6..c0522fcd 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -76,7 +76,7 @@ public class BaseBlockRender setOriMap(); } - public static void setOriMap() + private static void setOriMap() { // pointed up... ORIENTATION_MAP[0][3][1] = 0; @@ -275,7 +275,7 @@ public class BaseBlockRender return ( r << 16 ) | ( g << 8 ) | b; } - public double getTesrRenderDistance() + double getTesrRenderDistance() { return this.renderDistance; } @@ -312,7 +312,7 @@ public class BaseBlockRender renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; } - public static int getOrientation( final ForgeDirection in, final ForgeDirection forward, final ForgeDirection up ) + static int getOrientation( final ForgeDirection in, final ForgeDirection forward, final ForgeDirection up ) { if( in == null || in == ForgeDirection.UNKNOWN // 1 || forward == null || forward == ForgeDirection.UNKNOWN // 2 @@ -391,7 +391,7 @@ public class BaseBlockRender } } - public IIcon firstNotNull( final IIcon... s ) + private IIcon firstNotNull( final IIcon... s ) { for( final IIcon o : s ) { diff --git a/src/main/java/appeng/client/render/BlockRenderInfo.java b/src/main/java/appeng/client/render/BlockRenderInfo.java index 474303fd..ae7555c7 100644 --- a/src/main/java/appeng/client/render/BlockRenderInfo.java +++ b/src/main/java/appeng/client/render/BlockRenderInfo.java @@ -29,7 +29,7 @@ import appeng.client.texture.TmpFlippableIcon; public class BlockRenderInfo { - public final BaseBlockRender rendererInstance; + private final BaseBlockRender rendererInstance; private final TmpFlippableIcon tmpTopIcon = new TmpFlippableIcon(); private final TmpFlippableIcon tmpBottomIcon = new TmpFlippableIcon(); private final TmpFlippableIcon tmpSouthIcon = new TmpFlippableIcon(); @@ -132,8 +132,13 @@ public class BlockRenderInfo return this.topIcon; } - public boolean isValid() + boolean isValid() { return this.topIcon != null && this.bottomIcon != null && this.southIcon != null && this.northIcon != null && this.eastIcon != null && this.westIcon != null; } + + public BaseBlockRender getRendererInstance() + { + return this.rendererInstance; + } } diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index a7501f96..3ae857ae 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -253,7 +253,7 @@ public final class BusRenderHelper implements IPartRenderHelper this.renderingForPass = pass; } - public boolean renderThis() + private boolean renderThis() { if( this.renderingForPass == this.currentPass || this.noAlphaPass ) { @@ -266,23 +266,23 @@ public final class BusRenderHelper implements IPartRenderHelper @Override public void normalRendering() { - final RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.renderer; - rbw.calculations = true; - rbw.useTextures = true; + final RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.getRenderer(); + rbw.setCalculations( true ); + rbw.setUseTextures( true ); rbw.enableAO = false; } @Override public ISimplifiedBundle useSimplifiedRendering( final int x, final int y, final int z, final IBoxProvider p, final ISimplifiedBundle sim ) { - final RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.renderer; + final RenderBlocksWorkaround rbw = BusRenderer.INSTANCE.getRenderer(); if( sim != null && this.maybeBlock.isPresent() && rbw.similarLighting( this.maybeBlock.get(), rbw.blockAccess, x, y, z, sim ) ) { rbw.populate( sim ); - rbw.faces = EnumSet.allOf( ForgeDirection.class ); - rbw.calculations = false; - rbw.useTextures = false; + rbw.setFaces( EnumSet.allOf( ForgeDirection.class ) ); + rbw.setCalculations( false ); + rbw.setUseTextures( false ); return sim; } @@ -290,8 +290,8 @@ public final class BusRenderHelper implements IPartRenderHelper { final boolean allFaces = rbw.renderAllFaces; rbw.renderAllFaces = true; - rbw.calculations = true; - rbw.faces.clear(); + rbw.setCalculations( true ); + rbw.getFaces().clear(); this.bbc.started = false; if( p == null ) @@ -339,10 +339,10 @@ public final class BusRenderHelper implements IPartRenderHelper rbw.renderStandardBlock( block, x, y, z ); } - rbw.faces = EnumSet.allOf( ForgeDirection.class ); + rbw.setFaces( EnumSet.allOf( ForgeDirection.class ) ); rbw.renderAllFaces = allFaces; - rbw.calculations = false; - rbw.useTextures = false; + rbw.setCalculations( false ); + rbw.setUseTextures( false ); return rbw.getLightingCache(); } @@ -392,7 +392,7 @@ public final class BusRenderHelper implements IPartRenderHelper } } - public ForgeDirection mapRotation( final ForgeDirection dir ) + private ForgeDirection mapRotation( final ForgeDirection dir ) { final ForgeDirection forward = this.az; final ForgeDirection up = this.ay; @@ -518,7 +518,7 @@ public final class BusRenderHelper implements IPartRenderHelper @Override public void setFacesToRender( final EnumSet faces ) { - BusRenderer.INSTANCE.renderer.renderFaces = faces; + BusRenderer.INSTANCE.getRenderer().setRenderFaces( faces ); } @Override diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index a5165fd6..9de36044 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -51,7 +51,7 @@ public class BusRenderer implements IItemRenderer public static final BusRenderer INSTANCE = new BusRenderer(); private static final Map RENDER_PART = new HashMap(); - public final RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); + private final RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); @Override public boolean handleRenderType( final ItemStack item, final ItemRenderType type ) @@ -120,13 +120,13 @@ public class BusRenderer implements IItemRenderer BusRenderHelper.INSTANCE.setBounds( 0, 0, 0, 1, 1, 1 ); BusRenderHelper.INSTANCE.setTexture( null ); BusRenderHelper.INSTANCE.setInvColor( 0xffffff ); - this.renderer.blockAccess = ClientHelper.proxy.getWorld(); + this.getRenderer().blockAccess = ClientHelper.proxy.getWorld(); BusRenderHelper.INSTANCE.setOrientation( ForgeDirection.EAST, ForgeDirection.UP, ForgeDirection.SOUTH ); - this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0; - this.renderer.useInventoryTint = false; - this.renderer.overrideBlockTexture = null; + this.getRenderer().uvRotateBottom = this.getRenderer().uvRotateEast = this.getRenderer().uvRotateNorth = this.getRenderer().uvRotateSouth = this.getRenderer().uvRotateTop = this.getRenderer().uvRotateWest = 0; + this.getRenderer().useInventoryTint = false; + this.getRenderer().overrideBlockTexture = null; if( item.getItem() instanceof IFacadeItem ) { @@ -141,7 +141,7 @@ public class BusRenderer implements IItemRenderer if( fp != null ) { - fp.renderInventory( BusRenderHelper.INSTANCE, this.renderer ); + fp.renderInventory( BusRenderHelper.INSTANCE, this.getRenderer() ); } } else @@ -155,18 +155,18 @@ public class BusRenderer implements IItemRenderer GL11.glTranslatef( 0.0f, 0.0f, -0.04f * ( 8 - depth ) - 0.06f ); } - ip.renderInventory( BusRenderHelper.INSTANCE, this.renderer ); + ip.renderInventory( BusRenderHelper.INSTANCE, this.getRenderer() ); } } - this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0; + this.getRenderer().uvRotateBottom = this.getRenderer().uvRotateEast = this.getRenderer().uvRotateNorth = this.getRenderer().uvRotateSouth = this.getRenderer().uvRotateTop = this.getRenderer().uvRotateWest = 0; GL11.glPopAttrib(); GL11.glPopMatrix(); } @Nullable - public IPart getRenderer( final ItemStack is, final IPartItem c ) + private IPart getRenderer( final ItemStack is, final IPartItem c ) { final int id = ( Item.getIdFromItem( is.getItem() ) << Platform.DEF_OFFSET ) | is.getItemDamage(); @@ -182,4 +182,9 @@ public class BusRenderer implements IItemRenderer return part; } + + public RenderBlocksWorkaround getRenderer() + { + return this.renderer; + } } diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index 5ea5bf9f..66fdf998 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -48,7 +48,7 @@ public class CableRenderHelper public void renderStatic( final CableBusContainer cableBusContainer, final IFacadeContainer iFacadeContainer ) { final TileEntity te = cableBusContainer.getTile(); - final RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.renderer; + final RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.getRenderer(); if( renderer.overrideBlockTexture != null ) { @@ -73,9 +73,9 @@ public class CableRenderHelper part.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.INSTANCE, renderer ); - renderer.faces = EnumSet.allOf( ForgeDirection.class ); - renderer.calculations = true; - renderer.useTextures = true; + renderer.setFaces( EnumSet.allOf( ForgeDirection.class ) ); + renderer.setCalculations( true ); + renderer.setUseTextures( true ); } } @@ -153,10 +153,10 @@ public class CableRenderHelper } } - renderer.isFacade = false; + renderer.setFacade( false ); renderer.enableAO = false; renderer.setTexture( null ); - renderer.calculations = true; + renderer.setCalculations( true ); } } @@ -261,7 +261,7 @@ public class CableRenderHelper } BusRenderHelper.INSTANCE.setOrientation( ax, ay, az ); - part.renderDynamic( x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.renderer ); + part.renderDynamic( x, y, z, BusRenderHelper.INSTANCE, BusRenderer.INSTANCE.getRenderer() ); } } } diff --git a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java index 467ca2ad..a0849313 100644 --- a/src/main/java/appeng/client/render/RenderBlocksWorkaround.java +++ b/src/main/java/appeng/client/render/RenderBlocksWorkaround.java @@ -22,6 +22,7 @@ package appeng.client.render; import java.lang.reflect.Field; import java.util.Arrays; import java.util.EnumSet; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -41,18 +42,18 @@ import appeng.core.AELog; public class RenderBlocksWorkaround extends RenderBlocks { - final int[] lightHashTmp = new int[27]; - public boolean calculations = true; - public EnumSet renderFaces = EnumSet.allOf( ForgeDirection.class ); - public EnumSet faces = EnumSet.allOf( ForgeDirection.class ); - public boolean isFacade = false; - public boolean useTextures = true; - public float opacity = 1.0f; - Field fBrightness; - Field fColor; + private final int[] lightHashTmp = new int[27]; + private boolean calculations = true; + private EnumSet renderFaces = EnumSet.allOf( ForgeDirection.class ); + private EnumSet faces = EnumSet.allOf( ForgeDirection.class ); + private boolean isFacade = false; + private boolean useTextures = true; + private float opacity = 1.0f; + private Field fBrightness = null; + private Field fColor = null; private LightingCache lightState = new LightingCache(); - public int getCurrentColor() + private int getCurrentColor() { try { @@ -76,7 +77,7 @@ public class RenderBlocksWorkaround extends RenderBlocks } } - public int getCurrentBrightness() + private int getCurrentBrightness() { try { @@ -100,7 +101,7 @@ public class RenderBlocksWorkaround extends RenderBlocks } } - public void setTexture( final IIcon ico ) + void setTexture( final IIcon ico ) { this.lightState.rXPos = this.lightState.rXNeg = this.lightState.rYPos = this.lightState.rYNeg = this.lightState.rZPos = this.lightState.rZNeg = ico; } @@ -115,31 +116,31 @@ public class RenderBlocksWorkaround extends RenderBlocks this.lightState.rZNeg = rZNeg; } - public boolean renderStandardBlockNoCalculations( final Block b, final int x, final int y, final int z ) + private boolean renderStandardBlockNoCalculations( final Block b, final int x, final int y, final int z ) { Tessellator.instance.setBrightness( this.lightState.bXPos ); this.restoreAO( this.lightState.aoXPos, this.lightState.foXPos ); - this.renderFaceXPos( b, x, y, z, this.useTextures ? this.lightState.rXPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal() ) ); + this.renderFaceXPos( b, x, y, z, this.isUseTextures() ? this.lightState.rXPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.EAST.ordinal() ) ); Tessellator.instance.setBrightness( this.lightState.bXNeg ); this.restoreAO( this.lightState.aoXNeg, this.lightState.foXNeg ); - this.renderFaceXNeg( b, x, y, z, this.useTextures ? this.lightState.rXNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal() ) ); + this.renderFaceXNeg( b, x, y, z, this.isUseTextures() ? this.lightState.rXNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.WEST.ordinal() ) ); Tessellator.instance.setBrightness( this.lightState.bYPos ); this.restoreAO( this.lightState.aoYPos, this.lightState.foYPos ); - this.renderFaceYPos( b, x, y, z, this.useTextures ? this.lightState.rYPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal() ) ); + this.renderFaceYPos( b, x, y, z, this.isUseTextures() ? this.lightState.rYPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.UP.ordinal() ) ); Tessellator.instance.setBrightness( this.lightState.bYNeg ); this.restoreAO( this.lightState.aoYNeg, this.lightState.foYNeg ); - this.renderFaceYNeg( b, x, y, z, this.useTextures ? this.lightState.rYNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal() ) ); + this.renderFaceYNeg( b, x, y, z, this.isUseTextures() ? this.lightState.rYNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.DOWN.ordinal() ) ); Tessellator.instance.setBrightness( this.lightState.bZPos ); this.restoreAO( this.lightState.aoZPos, this.lightState.foZPos ); - this.renderFaceZPos( b, x, y, z, this.useTextures ? this.lightState.rZPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal() ) ); + this.renderFaceZPos( b, x, y, z, this.isUseTextures() ? this.lightState.rZPos : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.SOUTH.ordinal() ) ); Tessellator.instance.setBrightness( this.lightState.bZNeg ); this.restoreAO( this.lightState.aoZNeg, this.lightState.foZNeg ); - this.renderFaceZNeg( b, x, y, z, this.useTextures ? this.lightState.rZNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal() ) ); + this.renderFaceZNeg( b, x, y, z, this.isUseTextures() ? this.lightState.rZNeg : this.getBlockIcon( b, this.blockAccess, x, y, z, ForgeDirection.NORTH.ordinal() ) ); return true; } @@ -150,7 +151,7 @@ public class RenderBlocksWorkaround extends RenderBlocks this.brightnessBottomRight = z[1]; this.brightnessTopLeft = z[2]; this.brightnessTopRight = z[3]; - Tessellator.instance.setColorRGBA_I( z[4], (int) ( this.opacity * 255 ) ); + Tessellator.instance.setColorRGBA_I( z[4], (int) ( this.getOpacity() * 255 ) ); this.colorRedTopLeft = c[0]; this.colorGreenTopLeft = c[1]; @@ -193,7 +194,7 @@ public class RenderBlocksWorkaround extends RenderBlocks { try { - if( this.calculations ) + if( this.isCalculations() ) { this.lightState.lightHash = this.getLightingHash( blk, this.blockAccess, x, y, z ); return super.renderStandardBlock( blk, x, y, z ); @@ -217,14 +218,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceYNeg( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.DOWN ) ) + if( this.getFaces().contains( ForgeDirection.DOWN ) ) { - if( !this.renderFaces.contains( ForgeDirection.DOWN ) ) + if( !this.getRenderFaces().contains( ForgeDirection.DOWN ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -275,14 +276,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceYPos( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.UP ) ) + if( this.getFaces().contains( ForgeDirection.UP ) ) { - if( !this.renderFaces.contains( ForgeDirection.UP ) ) + if( !this.getRenderFaces().contains( ForgeDirection.UP ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -333,14 +334,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceZNeg( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.NORTH ) ) + if( this.getFaces().contains( ForgeDirection.NORTH ) ) { - if( !this.renderFaces.contains( ForgeDirection.NORTH ) ) + if( !this.getRenderFaces().contains( ForgeDirection.NORTH ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -391,14 +392,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceZPos( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.SOUTH ) ) + if( this.getFaces().contains( ForgeDirection.SOUTH ) ) { - if( !this.renderFaces.contains( ForgeDirection.SOUTH ) ) + if( !this.getRenderFaces().contains( ForgeDirection.SOUTH ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -449,14 +450,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceXNeg( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.WEST ) ) + if( this.getFaces().contains( ForgeDirection.WEST ) ) { - if( !this.renderFaces.contains( ForgeDirection.WEST ) ) + if( !this.getRenderFaces().contains( ForgeDirection.WEST ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -507,14 +508,14 @@ public class RenderBlocksWorkaround extends RenderBlocks @Override public void renderFaceXPos( final Block par1Block, final double par2, final double par4, final double par6, final IIcon par8Icon ) { - if( this.faces.contains( ForgeDirection.EAST ) ) + if( this.getFaces().contains( ForgeDirection.EAST ) ) { - if( !this.renderFaces.contains( ForgeDirection.EAST ) ) + if( !this.getRenderFaces().contains( ForgeDirection.EAST ) ) { return; } - if( this.isFacade ) + if( this.isFacade() ) { final Tessellator tessellator = Tessellator.instance; @@ -586,7 +587,7 @@ public class RenderBlocksWorkaround extends RenderBlocks final int out = ( high << 16 ) | low; - Tessellator.instance.setColorRGBA_F( r, g, b, this.opacity ); + Tessellator.instance.setColorRGBA_F( r, g, b, this.getOpacity() ); Tessellator.instance.setBrightness( out ); } @@ -626,6 +627,66 @@ public class RenderBlocksWorkaround extends RenderBlocks return new LightingCache( this.lightState ); } + Set getFaces() + { + return this.faces; + } + + public void setFaces( final EnumSet faces ) + { + this.faces = faces; + } + + private boolean isCalculations() + { + return this.calculations; + } + + public void setCalculations( final boolean calculations ) + { + this.calculations = calculations; + } + + private boolean isUseTextures() + { + return this.useTextures; + } + + void setUseTextures( final boolean useTextures ) + { + this.useTextures = useTextures; + } + + private boolean isFacade() + { + return this.isFacade; + } + + public void setFacade( final boolean isFacade ) + { + this.isFacade = isFacade; + } + + private float getOpacity() + { + return this.opacity; + } + + public void setOpacity( final float opacity ) + { + this.opacity = opacity; + } + + private EnumSet getRenderFaces() + { + return this.renderFaces; + } + + void setRenderFaces( final EnumSet renderFaces ) + { + this.renderFaces = renderFaces; + } + private static class LightingCache implements ISimplifiedBundle { diff --git a/src/main/java/appeng/client/render/TESRWrapper.java b/src/main/java/appeng/client/render/TESRWrapper.java index 4b1c7000..52bfd0f5 100644 --- a/src/main/java/appeng/client/render/TESRWrapper.java +++ b/src/main/java/appeng/client/render/TESRWrapper.java @@ -39,7 +39,7 @@ import appeng.tile.AEBaseTile; public class TESRWrapper extends TileEntitySpecialRenderer { - public final RenderBlocks renderBlocksInstance = new RenderBlocks(); + private final RenderBlocks renderBlocksInstance = new RenderBlocks(); private final BaseBlockRender blkRender; private final double maxDistance; diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index 5300c139..56f4de3d 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -41,10 +41,10 @@ public final class WorldRender implements ISimpleBlockRenderingHandler { public static final WorldRender INSTANCE = new WorldRender(); - public final HashMap blockRenders = new HashMap(); - final int renderID = RenderingRegistry.getNextAvailableRenderId(); + private final HashMap blockRenders = new HashMap(); + private final int renderID = RenderingRegistry.getNextAvailableRenderId(); private final RenderBlocks renderer = new RenderBlocks(); - boolean hasError = false; + private boolean hasError = false; private WorldRender() { @@ -83,10 +83,10 @@ public final class WorldRender implements ISimpleBlockRenderingHandler private BaseBlockRender getRender( final AEBaseBlock block ) { - return block.getRendererInstance().rendererInstance; + return block.getRendererInstance().getRendererInstance(); } - public void renderItemBlock( final ItemStack item, final ItemRenderType type, final Object[] data ) + void renderItemBlock( final ItemStack item, final ItemRenderType type, final Object[] data ) { final Block blk = Block.getBlockFromItem( item.getItem() ); if( blk instanceof AEBaseBlock ) diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index 25d475e7..28081f50 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -107,7 +107,7 @@ public class RenderBlockAssembler extends BaseBlockRender this.applyTESRRotation( x, y, z, tile.getForward(), tile.getUp() ); GL11.glTranslated( 0.5, 0, 0.5 ); - GL11.glRotatef( tile.visibleRotation, 0, 1, 0 ); + GL11.glRotatef( tile.getVisibleRotation(), 0, 1, 0 ); GL11.glTranslated( -0.5, 0, -0.5 ); tess.setTranslation( -tile.xCoord, -tile.yCoord, -tile.zCoord ); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index 91d39203..8e991212 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -169,13 +169,13 @@ public class RenderBlockInscriber extends BaseBlockRender 800 ) { - tile.smash = false; + tile.setSmash( false ); } } @@ -261,7 +261,7 @@ public class RenderBlockInscriber extends BaseBlockRender final int lumen = 14 << 20 | 14 << 4; for( final Splotch s : tp.getDots() ) { - if( !validSides.contains( s.side ) ) + if( !validSides.contains( s.getSide() ) ) { continue; } - if( s.lumen ) + if( s.isLumen() ) { - tess.setColorOpaque_I( s.color.whiteVariant ); + tess.setColorOpaque_I( s.getColor().whiteVariant ); tess.setBrightness( lumen ); } else { - tess.setColorOpaque_I( s.color.mediumVariant ); + tess.setColorOpaque_I( s.getColor().mediumVariant ); tess.setBrightness( brightness ); } @@ -106,13 +106,13 @@ public class RenderBlockPaint extends BaseBlockRender pos_x = Math.max( buffer, Math.min( 1.0 - buffer, pos_x ) ); pos_y = Math.max( buffer, Math.min( 1.0 - buffer, pos_y ) ); - if( s.side == ForgeDirection.SOUTH || s.side == ForgeDirection.NORTH ) + if( s.getSide() == ForgeDirection.SOUTH || s.getSide() == ForgeDirection.NORTH ) { pos_x += x; pos_y += y; } - else if( s.side == ForgeDirection.UP || s.side == ForgeDirection.DOWN ) + else if( s.getSide() == ForgeDirection.UP || s.getSide() == ForgeDirection.DOWN ) { pos_x += x; pos_y += z; @@ -126,7 +126,7 @@ public class RenderBlockPaint extends BaseBlockRender final IIcon ico = icoSet[s.getSeed() % icoSet.length]; - switch( s.side ) + switch( s.getSide() ) { case UP: offset = 1.0 - offset; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java index 62f0ff65..7cbe4311 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java @@ -44,7 +44,7 @@ public class RenderBlockQuartzAccelerator extends BaseBlockRender 0 ) + if( skyChest.getPlayerOpen() > 0 ) { - skyChest.lidAngle += distance * 0.0001; + skyChest.setLidAngle( skyChest.getLidAngle() + distance * 0.0001f ); } else { - skyChest.lidAngle -= distance * 0.0001; + skyChest.setLidAngle( skyChest.getLidAngle() - distance * 0.0001f ); } - if( skyChest.lidAngle > 0.5f ) + if( skyChest.getLidAngle() > 0.5f ) { - skyChest.lidAngle = 0.5f; + skyChest.setLidAngle( 0.5f ); } - if( skyChest.lidAngle < 0.0f ) + if( skyChest.getLidAngle() < 0.0f ) { - skyChest.lidAngle = 0.0f; + skyChest.setLidAngle( 0.0f ); } - float lidAngle = skyChest.lidAngle; + float lidAngle = skyChest.getLidAngle(); lidAngle = 1.0F - lidAngle; lidAngle = 1.0F - lidAngle * lidAngle * lidAngle; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java index ecaf31a3..b6a8b49e 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java @@ -44,8 +44,7 @@ import appeng.tile.misc.TileSkyCompass; public class RenderBlockSkyCompass extends BaseBlockRender { - final ModelCompass model = new ModelCompass(); - float r = 0; + private final ModelCompass model = new ModelCompass(); public RenderBlockSkyCompass() { @@ -133,9 +132,9 @@ public class RenderBlockSkyCompass extends BaseBlockRender { - static byte[][][] offsets; + private static byte[][][] offsets; public RenderQuartzGlass() { diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index 581d2be3..7ef631b3 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -54,11 +54,11 @@ public class RendererCableBus extends BaseBlockRender 0; @@ -69,8 +69,8 @@ public class RendererCableBus extends BaseBlockRender locked = new HashSet(); - final TileEntity tileEntity; - final IPart part; - final IGuiItemObject obj; - final List dataChunks = new LinkedList(); - final HashMap syncData = new HashMap(); - public boolean isContainerValid = true; - public String customName; - public ContainerOpenContext openContext; - protected IMEInventoryHandler cellInv; - protected IEnergySource powerSrc; - boolean sentCustomName; - int ticksSinceCheck = 900; - IAEItemStack clientRequestedTargetItem = null; + private final InventoryPlayer invPlayer; + private final BaseActionSource mySrc; + private final HashSet locked = new HashSet(); + private final TileEntity tileEntity; + private final IPart part; + private final IGuiItemObject obj; + private final List dataChunks = new LinkedList(); + private final HashMap syncData = new HashMap(); + private boolean isContainerValid = true; + private String customName; + private ContainerOpenContext openContext; + private IMEInventoryHandler cellInv; + private IEnergySource powerSrc; + private boolean sentCustomName; + private int ticksSinceCheck = 900; + private IAEItemStack clientRequestedTargetItem = null; public AEBaseContainer( final InventoryPlayer ip, final TileEntity myTile, final IPart myPart ) { @@ -278,7 +278,7 @@ public abstract class AEBaseContainer extends Container this.clientRequestedTargetItem = stack == null ? null : stack.copy(); } - public BaseActionSource getSource() + public BaseActionSource getActionSource() { return this.mySrc; } @@ -297,7 +297,7 @@ public abstract class AEBaseContainer extends Container } this.ticksSinceCheck = 0; - this.isContainerValid = this.isContainerValid && this.hasAccess( security, requirePower ); + this.setValidContainer( this.isValidContainer() && this.hasAccess( security, requirePower ) ); } protected boolean hasAccess( final SecurityPermissions perm, final boolean requirePower ) @@ -322,7 +322,7 @@ public abstract class AEBaseContainer extends Container } final ISecurityGrid sg = g.getCache( ISecurityGrid.class ); - if( sg.hasPermission( this.invPlayer.player, perm ) ) + if( sg.hasPermission( this.getInventoryPlayer().player, perm ) ) { return true; } @@ -357,7 +357,7 @@ public abstract class AEBaseContainer extends Container public InventoryPlayer getPlayerInv() { - return this.invPlayer; + return this.getInventoryPlayer(); } public TileEntity getTileEntity() @@ -422,7 +422,7 @@ public abstract class AEBaseContainer extends Container if( newSlot instanceof AppEngSlot ) { final AppEngSlot s = (AppEngSlot) newSlot; - s.myContainer = this; + s.setContainer( this ); return super.addSlotToContainer( newSlot ); } else @@ -724,7 +724,7 @@ public abstract class AEBaseContainer extends Container @Override public boolean canInteractWith( final EntityPlayer entityplayer ) { - if( this.isContainerValid ) + if( this.isValidContainer() ) { if( this.tileEntity instanceof IInventory ) { @@ -738,7 +738,7 @@ public abstract class AEBaseContainer extends Container @Override public boolean canDragIntoSlot( final Slot s ) { - return ( (AppEngSlot) s ).isDraggable; + return ( (AppEngSlot) s ).isDraggable(); } public void doAction( final EntityPlayerMP player, final InventoryAction action, final int slot, final long id ) @@ -852,7 +852,7 @@ public abstract class AEBaseContainer extends Container switch( action ) { case SHIFT_CLICK: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -873,7 +873,7 @@ public abstract class AEBaseContainer extends Container ais.setStackSize( ais.getStackSize() - myItem.stackSize ); } - ais = Platform.poweredExtraction( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { adp.addItems( ais.getItemStack() ); @@ -881,7 +881,7 @@ public abstract class AEBaseContainer extends Container } break; case ROLL_DOWN: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -895,7 +895,7 @@ public abstract class AEBaseContainer extends Container ais.setStackSize( 1 ); final IAEItemStack extracted = ais.copy(); - ais = Platform.poweredInsert( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais == null ) { final InventoryAdaptor ia = new AdaptorPlayerHand( player ); @@ -903,7 +903,7 @@ public abstract class AEBaseContainer extends Container final ItemStack fail = ia.removeItems( 1, extracted.getItemStack(), null ); if( fail == null ) { - this.cellInv.extractItems( extracted, Actionable.MODULATE, this.mySrc ); + this.getCellInventory().extractItems( extracted, Actionable.MODULATE, this.getActionSource() ); } this.updateHeld( player ); @@ -913,7 +913,7 @@ public abstract class AEBaseContainer extends Container break; case ROLL_UP: case PICKUP_SINGLE: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -939,7 +939,7 @@ public abstract class AEBaseContainer extends Container { IAEItemStack ais = slotItem.copy(); ais.setStackSize( 1 ); - ais = Platform.poweredExtraction( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { final InventoryAdaptor ia = new AdaptorPlayerHand( player ); @@ -947,7 +947,7 @@ public abstract class AEBaseContainer extends Container final ItemStack fail = ia.addItems( ais.getItemStack() ); if( fail != null ) { - this.cellInv.injectItems( ais, Actionable.MODULATE, this.mySrc ); + this.getCellInventory().injectItems( ais, Actionable.MODULATE, this.getActionSource() ); } this.updateHeld( player ); @@ -956,7 +956,7 @@ public abstract class AEBaseContainer extends Container } break; case PICKUP_OR_SET_DOWN: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -967,7 +967,7 @@ public abstract class AEBaseContainer extends Container { IAEItemStack ais = slotItem.copy(); ais.setStackSize( ais.getItemStack().getMaxStackSize() ); - ais = Platform.poweredExtraction( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { player.inventory.setItemStack( ais.getItemStack() ); @@ -982,7 +982,7 @@ public abstract class AEBaseContainer extends Container else { IAEItemStack ais = AEApi.instance().storage().createItemStack( player.inventory.getItemStack() ); - ais = Platform.poweredInsert( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { player.inventory.setItemStack( ais.getItemStack() ); @@ -996,7 +996,7 @@ public abstract class AEBaseContainer extends Container break; case SPLIT_OR_PLACE_SINGLE: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -1008,13 +1008,13 @@ public abstract class AEBaseContainer extends Container IAEItemStack ais = slotItem.copy(); final long maxSize = ais.getItemStack().getMaxStackSize(); ais.setStackSize( maxSize ); - ais = this.cellInv.extractItems( ais, Actionable.SIMULATE, this.mySrc ); + ais = this.getCellInventory().extractItems( ais, Actionable.SIMULATE, this.getActionSource() ); if( ais != null ) { final long stackSize = Math.min( maxSize, ais.getStackSize() ); ais.setStackSize( ( stackSize + 1 ) >> 1 ); - ais = Platform.poweredExtraction( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); } if( ais != null ) @@ -1032,7 +1032,7 @@ public abstract class AEBaseContainer extends Container { IAEItemStack ais = AEApi.instance().storage().createItemStack( player.inventory.getItemStack() ); ais.setStackSize( 1 ); - ais = Platform.poweredInsert( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais == null ) { final ItemStack is = player.inventory.getItemStack(); @@ -1057,7 +1057,7 @@ public abstract class AEBaseContainer extends Container break; case MOVE_REGION: - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return; } @@ -1081,7 +1081,7 @@ public abstract class AEBaseContainer extends Container ais.setStackSize( ais.getStackSize() - myItem.stackSize ); } - ais = Platform.poweredExtraction( this.powerSrc, this.cellInv, ais, this.mySrc ); + ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() ); if( ais != null ) { adp.addItems( ais.getItemStack() ); @@ -1114,13 +1114,13 @@ public abstract class AEBaseContainer extends Container } } - public ItemStack shiftStoreItem( final ItemStack input ) + private ItemStack shiftStoreItem( final ItemStack input ) { - if( this.powerSrc == null || this.cellInv == null ) + if( this.getPowerSource() == null || this.getCellInventory() == null ) { return input; } - final IAEItemStack ais = Platform.poweredInsert( this.powerSrc, this.cellInv, AEApi.instance().storage().createItemStack( input ), this.mySrc ); + final IAEItemStack ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), AEApi.instance().storage().createItemStack( input ), this.getActionSource() ); if( ais == null ) { return null; @@ -1134,7 +1134,7 @@ public abstract class AEBaseContainer extends Container this.detectAndSendChanges(); } - protected void sendCustomName() + private void sendCustomName() { if( !this.sentCustomName ) { @@ -1167,14 +1167,14 @@ public abstract class AEBaseContainer extends Container { if( name.hasCustomName() ) { - this.customName = name.getCustomName(); + this.setCustomName( name.getCustomName() ); } - if( this.customName != null ) + if( this.getCustomName() != null ) { try { - NetworkHandler.instance.sendTo( new PacketValueConfig( "CustomName", this.customName ), (EntityPlayerMP) this.invPlayer.player ); + NetworkHandler.instance.sendTo( new PacketValueConfig( "CustomName", this.getCustomName() ), (EntityPlayerMP) this.getInventoryPlayer().player ); } catch( final IOException e ) { @@ -1208,12 +1208,12 @@ public abstract class AEBaseContainer extends Container // can take? - if( isA != null && !a.canTakeStack( this.invPlayer.player ) ) + if( isA != null && !a.canTakeStack( this.getInventoryPlayer().player ) ) { return; } - if( isB != null && !b.canTakeStack( this.invPlayer.player ) ) + if( isB != null && !b.canTakeStack( this.getInventoryPlayer().player ) ) { return; } @@ -1280,4 +1280,59 @@ public abstract class AEBaseContainer extends Container { return true; } + + public IMEInventoryHandler getCellInventory() + { + return this.cellInv; + } + + public void setCellInventory( final IMEInventoryHandler cellInv ) + { + this.cellInv = cellInv; + } + + public String getCustomName() + { + return this.customName; + } + + public void setCustomName( final String customName ) + { + this.customName = customName; + } + + public InventoryPlayer getInventoryPlayer() + { + return this.invPlayer; + } + + public boolean isValidContainer() + { + return this.isContainerValid; + } + + public void setValidContainer( final boolean isContainerValid ) + { + this.isContainerValid = isContainerValid; + } + + public ContainerOpenContext getOpenContext() + { + return this.openContext; + } + + public void setOpenContext( final ContainerOpenContext openContext ) + { + this.openContext = openContext; + } + + public IEnergySource getPowerSource() + { + return this.powerSrc; + } + + public void setPowerSource( final IEnergySource powerSrc ) + { + this.powerSrc = powerSrc; + } } diff --git a/src/main/java/appeng/container/ContainerOpenContext.java b/src/main/java/appeng/container/ContainerOpenContext.java index e5ac25e5..7fd4fc57 100644 --- a/src/main/java/appeng/container/ContainerOpenContext.java +++ b/src/main/java/appeng/container/ContainerOpenContext.java @@ -29,12 +29,12 @@ import appeng.api.parts.IPart; public class ContainerOpenContext { - public final boolean isItem; - public World w; - public int x; - public int y; - public int z; - public ForgeDirection side; + private final boolean isItem; + private World w; + private int x; + private int y; + private int z; + private ForgeDirection side; public ContainerOpenContext( final Object myItem ) { @@ -48,6 +48,56 @@ public class ContainerOpenContext { return null; } - return this.w.getTileEntity( this.x, this.y, this.z ); + return this.getWorld().getTileEntity( this.getX(), this.getY(), this.getZ() ); + } + + public ForgeDirection getSide() + { + return this.side; + } + + public void setSide( final ForgeDirection side ) + { + this.side = side; + } + + private int getZ() + { + return this.z; + } + + public void setZ( final int z ) + { + this.z = z; + } + + private int getY() + { + return this.y; + } + + public void setY( final int y ) + { + this.y = y; + } + + private int getX() + { + return this.x; + } + + public void setX( final int x ) + { + this.x = x; + } + + private World getWorld() + { + return this.w; + } + + public void setWorld( final World w ) + { + this.w = w; } } diff --git a/src/main/java/appeng/container/guisync/GuiSync.java b/src/main/java/appeng/container/guisync/GuiSync.java index 4a68fde0..14d6e922 100644 --- a/src/main/java/appeng/container/guisync/GuiSync.java +++ b/src/main/java/appeng/container/guisync/GuiSync.java @@ -19,11 +19,18 @@ package appeng.container.guisync; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +/** + * Annotates that this field should be synchronized between the server and client. + * Requires the field to be public. + */ @Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.FIELD ) public @interface GuiSync { diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 89a20c5e..49b0842c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -55,7 +55,6 @@ public class ContainerCellWorkbench extends ContainerUpgradeable public CopyMode copyMode = CopyMode.CLEAR_ON_REMOVE; private ItemStack prevStack = null; private int lastUpgrades = 0; - private ItemStack LastCell; public ContainerCellWorkbench( final InventoryPlayer ip, final TileCellWorkbench te ) { @@ -72,12 +71,12 @@ public class ContainerCellWorkbench extends ContainerUpgradeable } } - public void nextCopyMode() + public void nextWorkBenchCopyMode() { - this.workBench.getConfigManager().putSetting( Settings.COPY_MODE, Platform.nextEnum( this.getCopyMode() ) ); + this.workBench.getConfigManager().putSetting( Settings.COPY_MODE, Platform.nextEnum( this.getWorkBenchCopyMode() ) ); } - public CopyMode getCopyMode() + private CopyMode getWorkBenchCopyMode() { return (CopyMode) this.workBench.getConfigManager().getSetting( Settings.COPY_MODE ); } @@ -91,10 +90,10 @@ public class ContainerCellWorkbench extends ContainerUpgradeable @Override protected void setupConfig() { - final IInventory cell = this.upgradeable.getInventoryByName( "cell" ); - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.invPlayer ) ); + final IInventory cell = this.getUpgradeable().getInventoryByName( "cell" ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.getInventoryPlayer() ) ); - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); final IInventory upgradeInventory = new Upgrades(); // null, 3 * 8 ); @@ -115,7 +114,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable for( int z = 0; z < 8; z++ ) { final int iSLot = zz * 8 + z; - this.addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this.invPlayer ) ); + this.addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgradeInventory, this, iSLot, 187 + zz * 18, 8 + 18 * z, iSLot, this.getInventoryPlayer() ) ); } } /* @@ -148,7 +147,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { if( this.workBench.getWorldObj().getTileEntity( this.workBench.xCoord, this.workBench.yCoord, this.workBench.zCoord ) != this.workBench ) { - this.isContainerValid = false; + this.setValidContainer( false ); } for( final Object crafter : this.crafters ) @@ -170,8 +169,8 @@ public class ContainerCellWorkbench extends ContainerUpgradeable } } - this.copyMode = this.getCopyMode(); - this.fzMode = this.getFuzzyMode(); + this.setCopyMode( this.getWorkBenchCopyMode() ); + this.setFuzzyMode( this.getWorkBenchFuzzyMode() ); } this.prevStack = is; @@ -196,7 +195,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable { if( field.equals( "copyMode" ) ) { - this.workBench.getConfigManager().putSetting( Settings.COPY_MODE, this.copyMode ); + this.workBench.getConfigManager().putSetting( Settings.COPY_MODE, this.getCopyMode() ); } super.onUpdate( field, oldValue, newValue ); @@ -204,7 +203,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable public void clear() { - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); for( int x = 0; x < inv.getSizeInventory(); x++ ) { inv.setInventorySlotContents( x, null ); @@ -212,7 +211,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable this.detectAndSendChanges(); } - private FuzzyMode getFuzzyMode() + private FuzzyMode getWorkBenchFuzzyMode() { final ICellWorkbenchItem cwi = this.workBench.getCell(); if( cwi != null ) @@ -224,9 +223,9 @@ public class ContainerCellWorkbench extends ContainerUpgradeable public void partition() { - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); - final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( this.upgradeable.getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS ); + final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS ); Iterator i = new NullIterator(); if( cellInv != null ) @@ -252,6 +251,16 @@ public class ContainerCellWorkbench extends ContainerUpgradeable this.detectAndSendChanges(); } + public CopyMode getCopyMode() + { + return this.copyMode; + } + + private void setCopyMode( final CopyMode copyMode ) + { + this.copyMode = copyMode; + } + private class Upgrades implements IInventory { diff --git a/src/main/java/appeng/container/implementations/ContainerChest.java b/src/main/java/appeng/container/implementations/ContainerChest.java index f1ddc2dc..f20d891c 100644 --- a/src/main/java/appeng/container/implementations/ContainerChest.java +++ b/src/main/java/appeng/container/implementations/ContainerChest.java @@ -29,14 +29,14 @@ import appeng.tile.storage.TileChest; public class ContainerChest extends AEBaseContainer { - final TileChest chest; + private final TileChest chest; public ContainerChest( final InventoryPlayer ip, final TileChest chest ) { super( ip, chest, null ); this.chest = chest; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, this.chest, 1, 80, 37, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, this.chest, 1, 80, 37, this.getInventoryPlayer() ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/implementations/ContainerCondenser.java b/src/main/java/appeng/container/implementations/ContainerCondenser.java index c61c7515..8f7ec4e2 100644 --- a/src/main/java/appeng/container/implementations/ContainerCondenser.java +++ b/src/main/java/appeng/container/implementations/ContainerCondenser.java @@ -35,7 +35,7 @@ import appeng.util.Platform; public class ContainerCondenser extends AEBaseContainer implements IProgressProvider { - final TileCondenser condenser; + private final TileCondenser condenser; @GuiSync( 0 ) public long requiredEnergy = 0; @GuiSync( 1 ) @@ -64,8 +64,8 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv final double requiredEnergy = this.condenser.getRequiredPower(); this.requiredEnergy = requiredEnergy == 0 ? (int) maxStorage : (int) Math.min( requiredEnergy, maxStorage ); - this.storedPower = (int) this.condenser.storedPower; - this.output = (CondenserOutput) this.condenser.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT ); + this.storedPower = (int) this.condenser.getStoredPower(); + this.setOutput( (CondenserOutput) this.condenser.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT ) ); } super.detectAndSendChanges(); @@ -82,4 +82,14 @@ public class ContainerCondenser extends AEBaseContainer implements IProgressProv { return (int) this.requiredEnergy; } + + public CondenserOutput getOutput() + { + return this.output; + } + + private void setOutput( final CondenserOutput output ) + { + this.output = output; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java index 9b9f22ef..8508464b 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftAmount.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftAmount.java @@ -19,6 +19,8 @@ package appeng.container.implementations; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.world.World; @@ -38,17 +40,15 @@ import appeng.tile.inventory.AppEngInternalInventory; public class ContainerCraftAmount extends AEBaseContainer { - public final Slot craftingItem; - final ITerminalHost priHost; - public IAEItemStack whatToMake; + private final Slot craftingItem; + private IAEItemStack itemToCreate; public ContainerCraftAmount( final InventoryPlayer ip, final ITerminalHost te ) { super( ip, te ); - this.priHost = te; this.craftingItem = new SlotInaccessible( new AppEngInternalInventory( null, 1 ), 0, 34, 53 ); - this.addSlotToContainer( this.craftingItem ); + this.addSlotToContainer( this.getCraftingItem() ); } @Override @@ -73,4 +73,19 @@ public class ContainerCraftAmount extends AEBaseContainer { return new PlayerSource( this.getPlayerInv().player, (IActionHost) this.getTarget() ); } + + public Slot getCraftingItem() + { + return this.craftingItem; + } + + public IAEItemStack getItemToCraft() + { + return this.itemToCreate; + } + + public void setItemToCraft( @Nonnull final IAEItemStack itemToCreate ) + { + this.itemToCreate = itemToCreate; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 6f96ac8a..b20dc6a2 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.Future; +import javax.annotation.Nonnull; + import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.EntityPlayer; @@ -67,10 +69,9 @@ import appeng.util.Platform; public class ContainerCraftConfirm extends AEBaseContainer { - public final ArrayList cpus = new ArrayList(); - final ITerminalHost priHost; - public Future job; - public ICraftingJob result; + private final ArrayList cpus = new ArrayList(); + private Future job; + private ICraftingJob result; @GuiSync( 0 ) public long bytesUsed; @GuiSync( 1 ) @@ -87,45 +88,43 @@ public class ContainerCraftConfirm extends AEBaseContainer public boolean noCPU = true; @GuiSync( 7 ) public String myName = ""; - protected long cpuIdx = Long.MIN_VALUE; public ContainerCraftConfirm( final InventoryPlayer ip, final ITerminalHost te ) { super( ip, te ); - this.priHost = te; } public void cycleCpu( final boolean next ) { if( next ) { - this.selectedCpu++; + this.setSelectedCpu( this.getSelectedCpu() + 1 ); } else { - this.selectedCpu--; + this.setSelectedCpu( this.getSelectedCpu() - 1 ); } - if( this.selectedCpu < -1 ) + if( this.getSelectedCpu() < -1 ) { - this.selectedCpu = this.cpus.size() - 1; + this.setSelectedCpu( this.cpus.size() - 1 ); } - else if( this.selectedCpu >= this.cpus.size() ) + else if( this.getSelectedCpu() >= this.cpus.size() ) { - this.selectedCpu = -1; + this.setSelectedCpu( -1 ); } - if( this.selectedCpu == -1 ) + if( this.getSelectedCpu() == -1 ) { - this.cpuBytesAvail = 0; - this.cpuCoProcessors = 0; - this.myName = ""; + this.setCpuAvailableBytes( 0 ); + this.setCpuCoProcessors( 0 ); + this.setName( "" ); } else { - this.myName = this.cpus.get( this.selectedCpu ).myName; - this.cpuBytesAvail = this.cpus.get( this.selectedCpu ).size; - this.cpuCoProcessors = this.cpus.get( this.selectedCpu ).processors; + this.setName( this.cpus.get( this.getSelectedCpu() ).getName() ); + this.setCpuAvailableBytes( this.cpus.get( this.getSelectedCpu() ).getSize() ); + this.setCpuCoProcessors( this.cpus.get( this.getSelectedCpu() ).getProcessors() ); } } @@ -147,7 +146,7 @@ public class ContainerCraftConfirm extends AEBaseContainer boolean found = false; for( final CraftingCPURecord ccr : this.cpus ) { - if( ccr.cpu == c ) + if( ccr.getCpu() == c ) { found = true; } @@ -180,20 +179,20 @@ public class ContainerCraftConfirm extends AEBaseContainer this.sendCPUs(); } - this.noCPU = this.cpus.isEmpty(); + this.setNoCPU( this.cpus.isEmpty() ); super.detectAndSendChanges(); - if( this.job != null && this.job.isDone() ) + if( this.getJob() != null && this.getJob().isDone() ) { try { - this.result = this.job.get(); + this.result = this.getJob().get(); if( !this.result.isSimulation() ) { - this.simulation = false; - if( this.autoStart ) + this.setSimulation( false ); + if( this.isAutoStart() ) { this.startJob(); return; @@ -201,7 +200,7 @@ public class ContainerCraftConfirm extends AEBaseContainer } else { - this.simulation = true; + this.setSimulation( true ); } try @@ -213,7 +212,7 @@ public class ContainerCraftConfirm extends AEBaseContainer final IItemList plan = AEApi.instance().storage().createItemList(); this.result.populatePlan( plan ); - this.bytesUsed = this.result.getByteTotal(); + this.setUsedBytes( this.result.getByteTotal() ); for( final IAEItemStack out : plan ) { @@ -233,7 +232,7 @@ public class ContainerCraftConfirm extends AEBaseContainer if( c != null && this.result.isSimulation() ) { m = o.copy(); - o = items.extractItems( o, Actionable.SIMULATE, this.mySrc ); + o = items.extractItems( o, Actionable.SIMULATE, this.getActionSource() ); if( o == null ) { @@ -282,16 +281,16 @@ public class ContainerCraftConfirm extends AEBaseContainer { this.getPlayerInv().player.addChatMessage( new ChatComponentText( "Error: " + e.toString() ) ); AELog.error( e ); - this.isContainerValid = false; + this.setValidContainer( false ); this.result = null; } - this.job = null; + this.setJob( null ); } this.verifyPermissions( SecurityPermissions.CRAFT, false ); } - public IGrid getGrid() + private IGrid getGrid() { final IActionHost h = ( (IActionHost) this.getTarget() ); return h.getActionableNode().getGrid(); @@ -299,25 +298,25 @@ public class ContainerCraftConfirm extends AEBaseContainer private boolean cpuMatches( final ICraftingCPU c ) { - return c.getAvailableStorage() >= this.bytesUsed && !c.isBusy(); + return c.getAvailableStorage() >= this.getUsedBytes() && !c.isBusy(); } private void sendCPUs() { Collections.sort( this.cpus ); - if( this.selectedCpu >= this.cpus.size() ) + if( this.getSelectedCpu() >= this.cpus.size() ) { - this.selectedCpu = -1; - this.cpuBytesAvail = 0; - this.cpuCoProcessors = 0; - this.myName = ""; + this.setSelectedCpu( -1 ); + this.setCpuAvailableBytes( 0 ); + this.setCpuCoProcessors( 0 ); + this.setName( "" ); } - else if( this.selectedCpu != -1 ) + else if( this.getSelectedCpu() != -1 ) { - this.myName = this.cpus.get( this.selectedCpu ).myName; - this.cpuBytesAvail = this.cpus.get( this.selectedCpu ).size; - this.cpuCoProcessors = this.cpus.get( this.selectedCpu ).processors; + this.setName( this.cpus.get( this.getSelectedCpu() ).getName() ); + this.setCpuAvailableBytes( this.cpus.get( this.getSelectedCpu() ).getSize() ); + this.setCpuCoProcessors( this.cpus.get( this.getSelectedCpu() ).getProcessors() ); } } @@ -346,22 +345,22 @@ public class ContainerCraftConfirm extends AEBaseContainer originalGui = GuiBridge.GUI_PATTERN_TERMINAL; } - if( this.result != null && !this.simulation ) + if( this.result != null && !this.isSimulation() ) { final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class ); - final ICraftingLink g = cc.submitJob( this.result, null, this.selectedCpu == -1 ? null : this.cpus.get( this.selectedCpu ).cpu, true, this.getActionSrc() ); - this.autoStart = false; - if( g != null && originalGui != null && this.openContext != null ) + final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() ); + this.setAutoStart( false ); + if( g != null && originalGui != null && this.getOpenContext() != null ) { - NetworkHandler.instance.sendTo( new PacketSwitchGuis( originalGui ), (EntityPlayerMP) this.invPlayer.player ); + NetworkHandler.instance.sendTo( new PacketSwitchGuis( originalGui ), (EntityPlayerMP) this.getInventoryPlayer().player ); - final TileEntity te = this.openContext.getTile(); - Platform.openGUI( this.invPlayer.player, te, this.openContext.side, originalGui ); + final TileEntity te = this.getOpenContext().getTile(); + Platform.openGUI( this.getInventoryPlayer().player, te, this.getOpenContext().getSide(), originalGui ); } } } - public BaseActionSource getActionSrc() + private BaseActionSource getActionSrc() { return new PlayerSource( this.getPlayerInv().player, (IActionHost) this.getTarget() ); } @@ -370,10 +369,10 @@ public class ContainerCraftConfirm extends AEBaseContainer public void removeCraftingFromCrafters( final ICrafting c ) { super.removeCraftingFromCrafters( c ); - if( this.job != null ) + if( this.getJob() != null ) { - this.job.cancel( true ); - this.job = null; + this.getJob().cancel( true ); + this.setJob( null ); } } @@ -381,10 +380,10 @@ public class ContainerCraftConfirm extends AEBaseContainer public void onContainerClosed( final EntityPlayer par1EntityPlayer ) { super.onContainerClosed( par1EntityPlayer ); - if( this.job != null ) + if( this.getJob() != null ) { - this.job.cancel( true ); - this.job = null; + this.getJob().cancel( true ); + this.setJob( null ); } } @@ -392,4 +391,94 @@ public class ContainerCraftConfirm extends AEBaseContainer { return this.getPlayerInv().player.worldObj; } + + public boolean isAutoStart() + { + return this.autoStart; + } + + public void setAutoStart( final boolean autoStart ) + { + this.autoStart = autoStart; + } + + public long getUsedBytes() + { + return this.bytesUsed; + } + + private void setUsedBytes( final long bytesUsed ) + { + this.bytesUsed = bytesUsed; + } + + public long getCpuAvailableBytes() + { + return this.cpuBytesAvail; + } + + private void setCpuAvailableBytes( final long cpuBytesAvail ) + { + this.cpuBytesAvail = cpuBytesAvail; + } + + public int getCpuCoProcessors() + { + return this.cpuCoProcessors; + } + + private void setCpuCoProcessors( final int cpuCoProcessors ) + { + this.cpuCoProcessors = cpuCoProcessors; + } + + public int getSelectedCpu() + { + return this.selectedCpu; + } + + private void setSelectedCpu( final int selectedCpu ) + { + this.selectedCpu = selectedCpu; + } + + public String getName() + { + return this.myName; + } + + private void setName( @Nonnull final String myName ) + { + this.myName = myName; + } + + public boolean hasNoCPU() + { + return this.noCPU; + } + + private void setNoCPU( final boolean noCPU ) + { + this.noCPU = noCPU; + } + + public boolean isSimulation() + { + return this.simulation; + } + + private void setSimulation( final boolean simulation ) + { + this.simulation = simulation; + } + + private Future getJob() + { + return this.job; + } + + public void setJob( final Future job ) + { + this.job = job; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index bcd9e855..1ea73965 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -54,11 +54,10 @@ import appeng.util.Platform; public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorHandlerReceiver, ICustomNameObject { - final IItemList list = AEApi.instance().storage().createItemList(); - protected IGrid network; - CraftingCPUCluster monitor = null; - String cpuName = null; - int delay = 40; + private final IItemList list = AEApi.instance().storage().createItemList(); + private IGrid network; + private CraftingCPUCluster monitor = null; + private String cpuName = null; @GuiSync( 0 ) public long eta = -1; @@ -82,34 +81,34 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH this.setCPU( (ICraftingCPU) ( (IAEMultiBlock) te ).getCluster() ); } - if( this.network == null && Platform.isServer() ) + if( this.getNetwork() == null && Platform.isServer() ) { - this.isContainerValid = false; + this.setValidContainer( false ); } } private void findNode( final IGridHost host, final ForgeDirection d ) { - if( this.network == null ) + if( this.getNetwork() == null ) { final IGridNode node = host.getGridNode( d ); if( node != null ) { - this.network = node.getGrid(); + this.setNetwork( node.getGrid() ); } } } protected void setCPU( final ICraftingCPU c ) { - if( c == this.monitor ) + if( c == this.getMonitor() ) { return; } - if( this.monitor != null ) + if( this.getMonitor() != null ) { - this.monitor.removeListener( this ); + this.getMonitor().removeListener( this ); } for( final Object g : this.crafters ) @@ -130,27 +129,27 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH if( c instanceof CraftingCPUCluster ) { this.cpuName = c.getName(); - this.monitor = (CraftingCPUCluster) c; + this.setMonitor( (CraftingCPUCluster) c ); this.list.resetStatus(); - this.monitor.getListOfItem( this.list, CraftingItemList.ALL ); - this.monitor.addListener( this, null ); - this.eta = 0; + this.getMonitor().getListOfItem( this.list, CraftingItemList.ALL ); + this.getMonitor().addListener( this, null ); + this.setEstimatedTime( 0 ); } else { - this.monitor = null; + this.setMonitor( null ); this.cpuName = ""; - this.eta = -1; + this.setEstimatedTime( -1 ); } } public void cancelCrafting() { - if( this.monitor != null ) + if( this.getMonitor() != null ) { - this.monitor.cancel(); + this.getMonitor().cancel(); } - this.eta = -1; + this.setEstimatedTime( -1 ); } @Override @@ -158,9 +157,9 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH { super.removeCraftingFromCrafters( c ); - if( this.crafters.isEmpty() && this.monitor != null ) + if( this.crafters.isEmpty() && this.getMonitor() != null ) { - this.monitor.removeListener( this ); + this.getMonitor().removeListener( this ); } } @@ -168,26 +167,26 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH public void onContainerClosed( final EntityPlayer player ) { super.onContainerClosed( player ); - if( this.monitor != null ) + if( this.getMonitor() != null ) { - this.monitor.removeListener( this ); + this.getMonitor().removeListener( this ); } } @Override public void detectAndSendChanges() { - if( Platform.isServer() && this.monitor != null && !this.list.isEmpty() ) + if( Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty() ) { try { - if( this.eta >= 0 ) + if( this.getEstimatedTime() >= 0 ) { - final long elapsedTime = this.monitor.getElapsedTime(); - final double remainingItems = this.monitor.getRemainingItemCount(); - final double startItems = this.monitor.getStartItemCount(); + final long elapsedTime = this.getMonitor().getElapsedTime(); + final double remainingItems = this.getMonitor().getRemainingItemCount(); + final double startItems = this.getMonitor().getStartItemCount(); final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems ); - this.eta = eta; + this.setEstimatedTime( eta ); } final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 ); @@ -196,9 +195,9 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH for( final IAEItemStack out : this.list ) { - a.appendItem( this.monitor.getItemStack( out, CraftingItemList.STORAGE ) ); - b.appendItem( this.monitor.getItemStack( out, CraftingItemList.ACTIVE ) ); - c.appendItem( this.monitor.getItemStack( out, CraftingItemList.PENDING ) ); + a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) ); + b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) ); + c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) ); } this.list.resetStatus(); @@ -266,4 +265,34 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH { return this.cpuName != null && this.cpuName.length() > 0; } + + public long getEstimatedTime() + { + return this.eta; + } + + private void setEstimatedTime( final long eta ) + { + this.eta = eta; + } + + CraftingCPUCluster getMonitor() + { + return this.monitor; + } + + private void setMonitor( final CraftingCPUCluster monitor ) + { + this.monitor = monitor; + } + + IGrid getNetwork() + { + return this.network; + } + + private void setNetwork( final IGrid network ) + { + this.network = network; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java index ee98ecde..ed04819a 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java @@ -21,6 +21,7 @@ package appeng.container.implementations; import java.util.ArrayList; import java.util.Collections; +import java.util.List; import com.google.common.collect.ImmutableSet; @@ -35,7 +36,7 @@ import appeng.container.guisync.GuiSync; public class ContainerCraftingStatus extends ContainerCraftingCPU { - public final ArrayList cpus = new ArrayList(); + private final List cpus = new ArrayList(); @GuiSync( 5 ) public int selectedCpu = -1; @GuiSync( 6 ) @@ -51,7 +52,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU @Override public void detectAndSendChanges() { - final ICraftingGrid cc = this.network.getCache( ICraftingGrid.class ); + final ICraftingGrid cc = this.getNetwork().getCache( ICraftingGrid.class ); final ImmutableSet cpuSet = cc.getCpus(); int matches = 0; @@ -61,7 +62,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU boolean found = false; for( final CraftingCPURecord ccr : this.cpus ) { - if( ccr.cpu == c ) + if( ccr.getCpu() == c ) { found = true; } @@ -115,7 +116,7 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU } else if( this.selectedCpu != -1 ) { - this.myName = this.cpus.get( this.selectedCpu ).myName; + this.myName = this.cpus.get( this.selectedCpu ).getName(); } if( this.selectedCpu == -1 && this.cpus.size() > 0 ) @@ -125,9 +126,9 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU if( this.selectedCpu != -1 ) { - if( this.cpus.get( this.selectedCpu ).cpu != this.monitor ) + if( this.cpus.get( this.selectedCpu ).getCpu() != this.getMonitor() ) { - this.setCPU( this.cpus.get( this.selectedCpu ).cpu ); + this.setCPU( this.cpus.get( this.selectedCpu ).getCpu() ); } } else @@ -168,8 +169,8 @@ public class ContainerCraftingStatus extends ContainerCraftingCPU } else { - this.myName = this.cpus.get( this.selectedCpu ).myName; - this.setCPU( this.cpus.get( this.selectedCpu ).cpu ); + this.myName = this.cpus.get( this.selectedCpu ).getName(); + this.setCPU( this.cpus.get( this.selectedCpu ).getCpu() ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java index 423df4c5..5405b835 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingTerm.java @@ -39,10 +39,10 @@ import appeng.tile.inventory.InvOperation; public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAEAppEngInventory, IContainerCraftingPacket { - public final PartCraftingTerminal ct; - final AppEngInternalInventory output = new AppEngInternalInventory( this, 1 ); - final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9]; - final SlotCraftingTerm outputSlot; + private final PartCraftingTerminal ct; + private final AppEngInternalInventory output = new AppEngInternalInventory( this, 1 ); + private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9]; + private final SlotCraftingTerm outputSlot; public ContainerCraftingTerm( final InventoryPlayer ip, final ITerminalHost monitorable ) { @@ -59,7 +59,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE } } - this.addSlotToContainer( this.outputSlot = new SlotCraftingTerm( this.getPlayerInv().player, this.mySrc, this.powerSrc, monitorable, crafting, crafting, this.output, 131, -72 + 18, this ) ); + this.addSlotToContainer( this.outputSlot = new SlotCraftingTerm( this.getPlayerInv().player, this.getActionSource(), this.getPowerSource(), monitorable, crafting, crafting, this.output, 131, -72 + 18, this ) ); this.bindPlayerInventory( ip, 0, 0 ); @@ -100,7 +100,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE { if( name.equals( "player" ) ) { - return this.invPlayer; + return this.getInventoryPlayer(); } return this.ct.getInventoryByName( name ); } diff --git a/src/main/java/appeng/container/implementations/ContainerDrive.java b/src/main/java/appeng/container/implementations/ContainerDrive.java index b5d88402..1e6e82fe 100644 --- a/src/main/java/appeng/container/implementations/ContainerDrive.java +++ b/src/main/java/appeng/container/implementations/ContainerDrive.java @@ -29,18 +29,15 @@ import appeng.tile.storage.TileDrive; public class ContainerDrive extends AEBaseContainer { - final TileDrive drive; - public ContainerDrive( final InventoryPlayer ip, final TileDrive drive ) { super( ip, drive, null ); - this.drive = drive; for( int y = 0; y < 5; y++ ) { for( int x = 0; x < 2; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, drive, x + y * 2, 71 + x * 18, 14 + y * 18, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, drive, x + y * 2, 71 + x * 18, 14 + y * 18, this.getInventoryPlayer() ) ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java index 641a950b..e6e35a6b 100644 --- a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java +++ b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java @@ -38,15 +38,12 @@ import appeng.util.Platform; public class ContainerFormationPlane extends ContainerUpgradeable { - final PartFormationPlane storageBus; - @GuiSync( 6 ) public YesNo placeMode; public ContainerFormationPlane( final InventoryPlayer ip, final PartFormationPlane te ) { super( ip, te ); - this.storageBus = te; } @Override @@ -61,7 +58,7 @@ public class ContainerFormationPlane extends ContainerUpgradeable final int xo = 8; final int yo = 23 + 6; - final IInventory config = this.upgradeable.getInventoryByName( "config" ); + final IInventory config = this.getUpgradeable().getInventoryByName( "config" ); for( int y = 0; y < 7; y++ ) { for( int x = 0; x < 9; x++ ) @@ -77,12 +74,12 @@ public class ContainerFormationPlane extends ContainerUpgradeable } } - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.invPlayer ) ).setNotDraggable() ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); } @Override @@ -104,8 +101,8 @@ public class ContainerFormationPlane extends ContainerUpgradeable if( Platform.isServer() ) { - this.fzMode = (FuzzyMode) this.upgradeable.getConfigManager().getSetting( Settings.FUZZY_MODE ); - this.placeMode = (YesNo) this.upgradeable.getConfigManager().getSetting( Settings.PLACE_BLOCK ); + this.setFuzzyMode( (FuzzyMode) this.getUpgradeable().getConfigManager().getSetting( Settings.FUZZY_MODE ) ); + this.setPlaceMode( (YesNo) this.getUpgradeable().getConfigManager().getSetting( Settings.PLACE_BLOCK ) ); } this.standardDetectAndSendChanges(); @@ -114,8 +111,18 @@ public class ContainerFormationPlane extends ContainerUpgradeable @Override public boolean isSlotEnabled( final int idx ) { - final int upgrades = this.upgradeable.getInstalledUpgrades( Upgrades.CAPACITY ); + final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY ); return upgrades > idx; } + + public YesNo getPlaceMode() + { + return this.placeMode; + } + + private void setPlaceMode( final YesNo placeMode ) + { + this.placeMode = placeMode; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerGrinder.java b/src/main/java/appeng/container/implementations/ContainerGrinder.java index 968913f3..d3569093 100644 --- a/src/main/java/appeng/container/implementations/ContainerGrinder.java +++ b/src/main/java/appeng/container/implementations/ContainerGrinder.java @@ -31,16 +31,13 @@ import appeng.tile.grindstone.TileGrinder; public class ContainerGrinder extends AEBaseContainer { - final TileGrinder grinder; - public ContainerGrinder( final InventoryPlayer ip, final TileGrinder grinder ) { super( ip, grinder, null ); - this.grinder = grinder; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 0, 12, 17, this.invPlayer ) ); - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 1, 12 + 18, 17, this.invPlayer ) ); - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 2, 12 + 36, 17, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 0, 12, 17, this.getInventoryPlayer() ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 1, 12 + 18, 17, this.getInventoryPlayer() ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ORE, grinder, 2, 12 + 36, 17, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotInaccessible( grinder, 6, 80, 40 ) ); diff --git a/src/main/java/appeng/container/implementations/ContainerIOPort.java b/src/main/java/appeng/container/implementations/ContainerIOPort.java index ab1225fa..069ca1e7 100644 --- a/src/main/java/appeng/container/implementations/ContainerIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerIOPort.java @@ -37,8 +37,6 @@ import appeng.util.Platform; public class ContainerIOPort extends ContainerUpgradeable { - final TileIOPort ioPort; - @GuiSync( 2 ) public FullnessMode fMode = FullnessMode.EMPTY; @GuiSync( 3 ) @@ -47,7 +45,6 @@ public class ContainerIOPort extends ContainerUpgradeable public ContainerIOPort( final InventoryPlayer ip, final TileIOPort te ) { super( ip, te ); - this.ioPort = te; } @Override @@ -62,13 +59,13 @@ public class ContainerIOPort extends ContainerUpgradeable int offX = 19; int offY = 17; - final IInventory cells = this.upgradeable.getInventoryByName( "cells" ); + final IInventory cells = this.getUpgradeable().getInventoryByName( "cells" ); for( int y = 0; y < 3; y++ ) { for( int x = 0; x < 2; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.getInventoryPlayer() ) ); } } @@ -82,10 +79,10 @@ public class ContainerIOPort extends ContainerUpgradeable } } - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); } @Override @@ -107,11 +104,31 @@ public class ContainerIOPort extends ContainerUpgradeable if( Platform.isServer() ) { - this.opMode = (OperationMode) this.upgradeable.getConfigManager().getSetting( Settings.OPERATION_MODE ); - this.fMode = (FullnessMode) this.upgradeable.getConfigManager().getSetting( Settings.FULLNESS_MODE ); - this.rsMode = (RedstoneMode) this.upgradeable.getConfigManager().getSetting( Settings.REDSTONE_CONTROLLED ); + this.setOperationMode( (OperationMode) this.getUpgradeable().getConfigManager().getSetting( Settings.OPERATION_MODE ) ); + this.setFullMode( (FullnessMode) this.getUpgradeable().getConfigManager().getSetting( Settings.FULLNESS_MODE ) ); + this.setRedStoneMode( (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting( Settings.REDSTONE_CONTROLLED ) ); } this.standardDetectAndSendChanges(); } + + public FullnessMode getFullMode() + { + return this.fMode; + } + + private void setFullMode( final FullnessMode fMode ) + { + this.fMode = fMode; + } + + public OperationMode getOperationMode() + { + return this.opMode; + } + + private void setOperationMode( final OperationMode opMode ) + { + this.opMode = opMode; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index 9281bbb7..220b139b 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -43,11 +43,11 @@ import appeng.util.Platform; public class ContainerInscriber extends ContainerUpgradeable implements IProgressProvider { - final TileInscriber ti; + private final TileInscriber ti; - final Slot top; - final Slot middle; - final Slot bottom; + private final Slot top; + private final Slot middle; + private final Slot bottom; @GuiSync( 2 ) public int maxProcessingTime = -1; @@ -60,9 +60,9 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres super( ip, te ); this.ti = te; - this.addSlotToContainer( this.top = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 0, 45, 16, this.invPlayer ) ); - this.addSlotToContainer( this.bottom = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 1, 45, 62, this.invPlayer ) ); - this.addSlotToContainer( this.middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, this.ti, 2, 63, 39, this.invPlayer ) ); + this.addSlotToContainer( this.top = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 0, 45, 16, this.getInventoryPlayer() ) ); + this.addSlotToContainer( this.bottom = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_PLATE, this.ti, 1, 45, 62, this.getInventoryPlayer() ) ); + this.addSlotToContainer( this.middle = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.INSCRIBER_INPUT, this.ti, 2, 63, 39, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( this.ti, 3, 113, 40, -1 ) ); } @@ -100,8 +100,8 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres if( Platform.isServer() ) { - this.maxProcessingTime = this.ti.maxProcessingTime; - this.processingTime = this.ti.processingTime; + this.maxProcessingTime = this.ti.getMaxProcessingTime(); + this.processingTime = this.ti.getProcessingTime(); } } diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index ea326e56..c70592e6 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -36,7 +36,7 @@ import appeng.helpers.IInterfaceHost; public class ContainerInterface extends ContainerUpgradeable { - final DualityInterface myDuality; + private final DualityInterface myDuality; @GuiSync( 3 ) public YesNo bMode = YesNo.NO; @@ -52,7 +52,7 @@ public class ContainerInterface extends ContainerUpgradeable for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ ) { - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) ); } for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ ) @@ -94,7 +94,27 @@ public class ContainerInterface extends ContainerUpgradeable @Override protected void loadSettingsFromHost( final IConfigManager cm ) { - this.bMode = (YesNo) cm.getSetting( Settings.BLOCK ); - this.iTermMode = (YesNo) cm.getSetting( Settings.INTERFACE_TERMINAL ); + this.setBlockingMode( (YesNo) cm.getSetting( Settings.BLOCK ) ); + this.setInterfaceTerminalMode( (YesNo) cm.getSetting( Settings.INTERFACE_TERMINAL ) ); + } + + public YesNo getBlockingMode() + { + return this.bMode; + } + + private void setBlockingMode( final YesNo bMode ) + { + this.bMode = bMode; + } + + public YesNo getInterfaceTerminalMode() + { + return this.iTermMode; + } + + private void setInterfaceTerminalMode( final YesNo iTermMode ) + { + this.iTermMode = iTermMode; } } diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 525796bc..2ecfed3e 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -62,10 +62,10 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer */ private static long autoBase = Long.MIN_VALUE; - final Map diList = new HashMap(); - final Map byId = new HashMap(); - IGrid grid; - NBTTagCompound data = new NBTTagCompound(); + private final Map diList = new HashMap(); + private final Map byId = new HashMap(); + private IGrid grid; + private NBTTagCompound data = new NBTTagCompound(); public ContainerInterfaceTerminal( final InventoryPlayer ip, final PartInterfaceTerminal anchor ) { @@ -401,14 +401,14 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer data.setTag( name, tag ); } - static class InvTracker + private static class InvTracker { - public final long sortBy; - final long which = autoBase++; - final String unlocalizedName; - final IInventory client; - final IInventory server; + private final long sortBy; + private final long which = autoBase++; + private final String unlocalizedName; + private final IInventory client; + private final IInventory server; public InvTracker( final DualityInterface dual, final IInventory patterns, final String unlocalizedName ) { @@ -419,7 +419,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer } } - static class PatternInvSlot extends WrapperInvSlot + private static class PatternInvSlot extends WrapperInvSlot { public PatternInvSlot( final IInventory inv ) diff --git a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java index 7c0f798b..926d97a8 100644 --- a/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java +++ b/src/main/java/appeng/container/implementations/ContainerLevelEmitter.java @@ -43,10 +43,10 @@ import appeng.util.Platform; public class ContainerLevelEmitter extends ContainerUpgradeable { - final PartLevelEmitter lvlEmitter; + private final PartLevelEmitter lvlEmitter; @SideOnly( Side.CLIENT ) - public GuiTextField textField; + private GuiTextField textField; @GuiSync( 2 ) public LevelType lvType; @GuiSync( 3 ) @@ -76,28 +76,28 @@ public class ContainerLevelEmitter extends ContainerUpgradeable @Override protected void setupConfig() { - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); if( this.availableUpgrades() > 0 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 1 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 2 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 3 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); } - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); final int y = 40; final int x = 80 + 44; - + this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) ); } @@ -122,10 +122,10 @@ public class ContainerLevelEmitter extends ContainerUpgradeable if( Platform.isServer() ) { this.EmitterValue = this.lvlEmitter.getReportingValue(); - this.cmType = (YesNo) this.upgradeable.getConfigManager().getSetting( Settings.CRAFT_VIA_REDSTONE ); - this.lvType = (LevelType) this.upgradeable.getConfigManager().getSetting( Settings.LEVEL_TYPE ); - this.fzMode = (FuzzyMode) this.upgradeable.getConfigManager().getSetting( Settings.FUZZY_MODE ); - this.rsMode = (RedstoneMode) this.upgradeable.getConfigManager().getSetting( Settings.REDSTONE_EMITTER ); + this.setCraftingMode( (YesNo) this.getUpgradeable().getConfigManager().getSetting( Settings.CRAFT_VIA_REDSTONE ) ); + this.setLevelMode( (LevelType) this.getUpgradeable().getConfigManager().getSetting( Settings.LEVEL_TYPE ) ); + this.setFuzzyMode( (FuzzyMode) this.getUpgradeable().getConfigManager().getSetting( Settings.FUZZY_MODE ) ); + this.setRedStoneMode( (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting( Settings.REDSTONE_EMITTER ) ); } this.standardDetectAndSendChanges(); @@ -142,4 +142,26 @@ public class ContainerLevelEmitter extends ContainerUpgradeable } } } + + @Override + public YesNo getCraftingMode() + { + return this.cmType; + } + + @Override + public void setCraftingMode( final YesNo cmType ) + { + this.cmType = cmType; + } + + public LevelType getLevelMode() + { + return this.lvType; + } + + private void setLevelMode( final LevelType lvType ) + { + this.lvType = lvType; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerMAC.java b/src/main/java/appeng/container/implementations/ContainerMAC.java index 22942b98..c33debc1 100644 --- a/src/main/java/appeng/container/implementations/ContainerMAC.java +++ b/src/main/java/appeng/container/implementations/ContainerMAC.java @@ -42,7 +42,7 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi { private static final int MAX_CRAFT_PROGRESS = 100; - final TileMolecularAssembler tma; + private final TileMolecularAssembler tma; @GuiSync( 4 ) public int craftProgress = 0; @@ -54,7 +54,7 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi public boolean isValidItemForSlot( final int slotIndex, final ItemStack i ) { - final IInventory mac = this.upgradeable.getInventoryByName( "mac" ); + final IInventory mac = this.getUpgradeable().getInventoryByName( "mac" ); final ItemStack is = mac.getStackInSlot( 10 ); if( is == null ) @@ -88,7 +88,7 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi int offX = 29; int offY = 30; - final IInventory mac = this.upgradeable.getInventoryByName( "mac" ); + final IInventory mac = this.getUpgradeable().getInventoryByName( "mac" ); for( int y = 0; y < 3; y++ ) { @@ -102,18 +102,18 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi offX = 126; offY = 16; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offX, offY, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_CRAFTING_PATTERN, mac, 10, offX, offY, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( mac, 9, offX, offY + 32, -1 ) ); offX = 122; offY = 17; - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.invPlayer ) ).setNotDraggable() ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); } @Override @@ -135,7 +135,7 @@ public class ContainerMAC extends ContainerUpgradeable implements IProgressProvi if( Platform.isServer() ) { - this.rsMode = (RedstoneMode) this.upgradeable.getConfigManager().getSetting( Settings.REDSTONE_CONTROLLED ); + this.setRedStoneMode( (RedstoneMode) this.getUpgradeable().getConfigManager().getSetting( Settings.REDSTONE_CONTROLLED ) ); } this.craftProgress = this.tma.getCraftingProgress(); diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index 413f117a..7f9640a5 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -22,6 +22,8 @@ package appeng.container.implementations; import java.io.IOException; import java.nio.BufferOverflowException; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -72,17 +74,17 @@ import appeng.util.Platform; public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver { - public final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; - final IMEMonitor monitor; - final IItemList items = AEApi.instance().storage().createItemList(); - final IConfigManager clientCM; + private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5]; + private final IMEMonitor monitor; + private final IItemList items = AEApi.instance().storage().createItemList(); + private final IConfigManager clientCM; private final ITerminalHost host; @GuiSync( 99 ) public boolean canAccessViewCells = false; @GuiSync( 98 ) public boolean hasPower = false; - public IConfigManagerHost gui; - IConfigManager serverCM; + private IConfigManagerHost gui; + private IConfigManager serverCM; private IGridNode networkNode; public ContainerMEMonitorable( final InventoryPlayer ip, final ITerminalHost monitorable ) @@ -110,15 +112,15 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { this.monitor.addListener( this, null ); - this.cellInv = this.monitor; + this.setCellInventory( this.monitor ); if( monitorable instanceof IPortableCell ) { - this.powerSrc = (IEnergySource) monitorable; + this.setPowerSource( (IEnergySource) monitorable ); } else if( monitorable instanceof IMEChest ) { - this.powerSrc = (IEnergySource) monitorable; + this.setPowerSource( (IEnergySource) monitorable ); } else if( monitorable instanceof IGridHost ) { @@ -129,14 +131,14 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa final IGrid g = node.getGrid(); if( g != null ) { - this.powerSrc = new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) ); + this.setPowerSource( new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) ) ); } } } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } else @@ -149,8 +151,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { for( int y = 0; y < 5; y++ ) { - this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.invPlayer ); - this.cellView[y].allowEdit = this.canAccessViewCells; + this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer() ); + this.cellView[y].setAllowEdit( this.canAccessViewCells ); this.addSlotToContainer( this.cellView[y] ); } } @@ -173,7 +175,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( this.monitor != this.host.getItemInventory() ) { - this.isContainerValid = false; + this.setValidContainer( false ); } for( final Settings set : this.serverCM.getSettings() ) @@ -249,7 +251,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( this.cellView[y] != null ) { - this.cellView[y].allowEdit = this.canAccessViewCells; + this.cellView[y].setAllowEdit( this.canAccessViewCells ); } } } @@ -264,15 +266,15 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( this.networkNode != null ) { - this.hasPower = this.networkNode.isActive(); + this.setPowered( this.networkNode.isActive() ); } - else if( this.powerSrc instanceof IEnergyGrid ) + else if( this.getPowerSource() instanceof IEnergyGrid ) { - this.hasPower = ( (IEnergyGrid) this.powerSrc ).isNetworkPowered(); + this.setPowered( ( (IEnergyGrid) this.getPowerSource() ).isNetworkPowered() ); } else { - this.hasPower = this.powerSrc.extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.8; + this.setPowered( this.getPowerSource().extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.8 ); } } catch( final Throwable t ) @@ -290,7 +292,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa { if( this.cellView[y] != null ) { - this.cellView[y].allowEdit = this.canAccessViewCells; + this.cellView[y].setAllowEdit( this.canAccessViewCells ); } } } @@ -305,7 +307,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa this.queueInventory( c ); } - public void queueInventory( final ICrafting c ) + private void queueInventory( final ICrafting c ) { if( Platform.isServer() && c instanceof EntityPlayer && this.monitor != null ) { @@ -390,9 +392,9 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa @Override public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) { - if( this.gui != null ) + if( this.getGui() != null ) { - this.gui.updateSetting( manager, settingName, newValue ); + this.getGui().updateSetting( manager, settingName, newValue ); } } @@ -417,4 +419,29 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa return list; } + + public SlotRestrictedInput getCellViewSlot( final int index ) + { + return this.cellView[index]; + } + + public boolean isPowered() + { + return this.hasPower; + } + + private void setPowered( final boolean isPowered ) + { + this.hasPower = isPowered; + } + + private IConfigManagerHost getGui() + { + return this.gui; + } + + public void setGui( @Nonnull final IConfigManagerHost gui ) + { + this.gui = gui; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java index 777305ad..6f414221 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java +++ b/src/main/java/appeng/container/implementations/ContainerMEPortableCell.java @@ -32,7 +32,7 @@ import appeng.util.Platform; public class ContainerMEPortableCell extends ContainerMEMonitorable { - public double powerMultiplier = 0.5; + private double powerMultiplier = 0.5; private final IPortableCell civ; private int ticks = 0; @@ -73,27 +73,37 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } // drain 1 ae t this.ticks++; if( this.ticks > 10 ) { - this.civ.extractAEPower( this.powerMultiplier * this.ticks, Actionable.MODULATE, PowerMultiplier.CONFIG ); + this.civ.extractAEPower( this.getPowerMultiplier() * this.ticks, Actionable.MODULATE, PowerMultiplier.CONFIG ); this.ticks = 0; } super.detectAndSendChanges(); } + + private double getPowerMultiplier() + { + return this.powerMultiplier; + } + + void setPowerMultiplier( final double powerMultiplier ) + { + this.powerMultiplier = powerMultiplier; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java index 03ed286a..f769b5d7 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkStatus.java @@ -55,8 +55,8 @@ public class ContainerNetworkStatus extends AEBaseContainer public long currentPower; @GuiSync( 3 ) public long maxPower; - IGrid network; - int delay = 40; + private IGrid network; + private int delay = 40; public ContainerNetworkStatus( final InventoryPlayer ip, final INetworkTool te ) { @@ -74,7 +74,7 @@ public class ContainerNetworkStatus extends AEBaseContainer if( this.network == null && Platform.isServer() ) { - this.isContainerValid = false; + this.setValidContainer( false ); } } @@ -101,10 +101,10 @@ public class ContainerNetworkStatus extends AEBaseContainer final IEnergyGrid eg = this.network.getCache( IEnergyGrid.class ); if( eg != null ) { - this.avgAddition = (long) ( 100.0 * eg.getAvgPowerInjection() ); - this.powerUsage = (long) ( 100.0 * eg.getAvgPowerUsage() ); - this.currentPower = (long) ( 100.0 * eg.getStoredPower() ); - this.maxPower = (long) ( 100.0 * eg.getMaxStoredPower() ); + this.setAverageAddition( (long) ( 100.0 * eg.getAvgPowerInjection() ) ); + this.setPowerUsage( (long) ( 100.0 * eg.getAvgPowerUsage() ) ); + this.setCurrentPower( (long) ( 100.0 * eg.getStoredPower() ) ); + this.setMaxPower( (long) ( 100.0 * eg.getMaxStoredPower() ) ); } try @@ -148,4 +148,44 @@ public class ContainerNetworkStatus extends AEBaseContainer } super.detectAndSendChanges(); } + + public long getCurrentPower() + { + return this.currentPower; + } + + private void setCurrentPower( final long currentPower ) + { + this.currentPower = currentPower; + } + + public long getMaxPower() + { + return this.maxPower; + } + + private void setMaxPower( final long maxPower ) + { + this.maxPower = maxPower; + } + + public long getAverageAddition() + { + return this.avgAddition; + } + + private void setAverageAddition( final long avgAddition ) + { + this.avgAddition = avgAddition; + } + + public long getPowerUsage() + { + return this.powerUsage; + } + + private void setPowerUsage( final long powerUsage ) + { + this.powerUsage = powerUsage; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java index db1ae73c..65d322de 100644 --- a/src/main/java/appeng/container/implementations/ContainerNetworkTool.java +++ b/src/main/java/appeng/container/implementations/ContainerNetworkTool.java @@ -33,7 +33,7 @@ import appeng.util.Platform; public class ContainerNetworkTool extends AEBaseContainer { - final INetworkTool toolInv; + private final INetworkTool toolInv; @GuiSync( 1 ) public boolean facadeMode; @@ -49,7 +49,7 @@ public class ContainerNetworkTool extends AEBaseContainer { for( int x = 0; x < 3; x++ ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, this.invPlayer ) ) ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, te, y * 3 + x, 80 - 18 + x * 18, 37 - 18 + y * 18, this.getInventoryPlayer() ) ) ); } } @@ -78,21 +78,31 @@ public class ContainerNetworkTool extends AEBaseContainer } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } - if( this.isContainerValid ) + if( this.isValidContainer() ) { final NBTTagCompound data = Platform.openNbtData( currentItem ); - this.facadeMode = data.getBoolean( "hideFacades" ); + this.setFacadeMode( data.getBoolean( "hideFacades" ) ); } super.detectAndSendChanges(); } + + public boolean isFacadeMode() + { + return this.facadeMode; + } + + private void setFacadeMode( final boolean facadeMode ) + { + this.facadeMode = facadeMode; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index fd56633c..97136efd 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -70,7 +70,7 @@ import appeng.util.item.AEItemStack; public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket { - public final PartPatternTerminal ct; + private final PartPatternTerminal patternTerminal; private final AppEngInternalInventory cOut = new AppEngInternalInventory( null, 1 ); private final IInventory crafting; private final SlotFakeCraftingMatrix[] craftingSlots = new SlotFakeCraftingMatrix[9]; @@ -86,12 +86,12 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA public ContainerPatternTerm( final InventoryPlayer ip, final ITerminalHost monitorable ) { super( ip, monitorable, false ); - this.ct = (PartPatternTerminal) monitorable; + this.patternTerminal = (PartPatternTerminal) monitorable; - final IInventory patternInv = this.ct.getInventoryByName( "pattern" ); - final IInventory output = this.ct.getInventoryByName( "output" ); + final IInventory patternInv = this.getPatternTerminal().getInventoryByName( "pattern" ); + final IInventory output = this.getPatternTerminal().getInventoryByName( "output" ); - this.crafting = this.ct.getInventoryByName( "crafting" ); + this.crafting = this.getPatternTerminal().getInventoryByName( "crafting" ); for( int y = 0; y < 3; y++ ) { @@ -101,18 +101,18 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA } } - this.addSlotToContainer( this.craftSlot = new SlotPatternTerm( ip.player, this.mySrc, this.powerSrc, monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this ) ); - this.craftSlot.IIcon = -1; + this.addSlotToContainer( this.craftSlot = new SlotPatternTerm( ip.player, this.getActionSource(), this.getPowerSource(), monitorable, this.crafting, patternInv, this.cOut, 110, -76 + 18, this, 2, this ) ); + this.craftSlot.setIIcon( -1 ); for( int y = 0; y < 3; y++ ) { this.addSlotToContainer( this.outputSlots[y] = new SlotPatternOutputs( output, this, y, 110, -76 + y * 18, 0, 0, 1 ) ); - this.outputSlots[y].renderDisabled = false; - this.outputSlots[y].IIcon = -1; + this.outputSlots[y].setRenderDisabled( false ); + this.outputSlots[y].setIIcon( -1 ); } - this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.invPlayer ) ); - this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.invPlayer ) ); + this.addSlotToContainer( this.patternSlotIN = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BLANK_PATTERN, patternInv, 0, 147, -72 - 9, this.getInventoryPlayer() ) ); + this.addSlotToContainer( this.patternSlotOUT = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, patternInv, 1, 147, -72 + 34, this.getInventoryPlayer() ) ); this.patternSlotOUT.setStackLimit( 1 ); @@ -122,18 +122,18 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA private void updateOrderOfOutputSlots() { - if( !this.craftingMode ) + if( !this.isCraftingMode() ) { this.craftSlot.xDisplayPosition = -9000; for( int y = 0; y < 3; y++ ) { - this.outputSlots[y].xDisplayPosition = this.outputSlots[y].defX; + this.outputSlots[y].xDisplayPosition = this.outputSlots[y].getX(); } } else { - this.craftSlot.xDisplayPosition = this.craftSlot.defX; + this.craftSlot.xDisplayPosition = this.craftSlot.getX(); for( int y = 0; y < 3; y++ ) { @@ -156,7 +156,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA this.getAndUpdateOutput(); } - public ItemStack getAndUpdateOutput() + private ItemStack getAndUpdateOutput() { final InventoryCrafting ic = new InventoryCrafting( this, 3, 3 ); @@ -241,8 +241,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA encodedValue.setTag( "in", tagIn ); encodedValue.setTag( "out", tagOut ); - encodedValue.setBoolean( "crafting", this.craftingMode ); - encodedValue.setBoolean( "substitute", this.substitute ); + encodedValue.setBoolean( "crafting", this.isCraftingMode() ); + encodedValue.setBoolean( "substitute", this.isSubstitute() ); output.setTagCompound( encodedValue ); } @@ -271,7 +271,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA private ItemStack[] getOutputs() { - if( this.craftingMode ) + if( this.isCraftingMode() ) { final ItemStack out = this.getAndUpdateOutput(); @@ -337,11 +337,11 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( idx == 1 ) { - return Platform.isServer() ? !this.ct.isCraftingRecipe() : !this.craftingMode; + return Platform.isServer() ? !this.getPatternTerminal().isCraftingRecipe() : !this.isCraftingMode(); } else if( idx == 2 ) { - return Platform.isServer() ? this.ct.isCraftingRecipe() : this.craftingMode; + return Platform.isServer() ? this.getPatternTerminal().isCraftingRecipe() : this.isCraftingMode(); } else { @@ -351,7 +351,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA public void craftOrGetItem( final PacketPatternSlot packetPatternSlot ) { - if( packetPatternSlot.slotItem != null && this.cellInv != null ) + if( packetPatternSlot.slotItem != null && this.getCellInventory() != null ) { final IAEItemStack out = packetPatternSlot.slotItem.copy(); InventoryAdaptor inv = new AdaptorPlayerHand( this.getPlayerInv().player ); @@ -367,7 +367,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA return; } - final IAEItemStack extracted = Platform.poweredExtraction( this.powerSrc, this.cellInv, out, this.mySrc ); + final IAEItemStack extracted = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), out, this.getActionSource() ); final EntityPlayer p = this.getPlayerInv().player; if( extracted != null ) @@ -396,7 +396,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA return; } - final IMEMonitor storage = this.ct.getItemInventory(); + final IMEMonitor storage = this.getPatternTerminal().getItemInventory(); final IItemList all = storage.getStorageList(); final ItemStack is = r.getCraftingResult( ic ); @@ -405,7 +405,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( ic.getStackInSlot( x ) != null ) { - final ItemStack pulled = Platform.extractItemsByRecipe( this.powerSrc, this.mySrc, storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) ); + final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) ); real.setInventorySlotContents( x, pulled ); } } @@ -441,7 +441,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA final ItemStack failed = real.getStackInSlot( x ); if( failed != null ) { - this.cellInv.injectItems( AEItemStack.create( failed ), Actionable.MODULATE, new MachineSource( this.ct ) ); + this.getCellInventory().injectItems( AEItemStack.create( failed ), Actionable.MODULATE, new MachineSource( this.getPatternTerminal() ) ); } } } @@ -454,13 +454,13 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA super.detectAndSendChanges(); if( Platform.isServer() ) { - if( this.craftingMode != this.ct.isCraftingRecipe() ) + if( this.isCraftingMode() != this.getPatternTerminal().isCraftingRecipe() ) { - this.craftingMode = this.ct.isCraftingRecipe(); + this.setCraftingMode( this.getPatternTerminal().isCraftingRecipe() ); this.updateOrderOfOutputSlots(); } - this.substitute = this.ct.isSubstitution(); + this.substitute = this.patternTerminal.isSubstitution(); } } @@ -520,9 +520,9 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA { if( name.equals( "player" ) ) { - return this.invPlayer; + return this.getInventoryPlayer(); } - return this.ct.getInventoryByName( name ); + return this.getPatternTerminal().getInventoryByName( name ); } @Override @@ -538,4 +538,29 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA this.detectAndSendChanges(); this.getAndUpdateOutput(); } + + public boolean isCraftingMode() + { + return this.craftingMode; + } + + private void setCraftingMode( final boolean craftingMode ) + { + this.craftingMode = craftingMode; + } + + public PartPatternTerminal getPatternTerminal() + { + return this.patternTerminal; + } + + private boolean isSubstitute() + { + return this.substitute; + } + + public void setSubstitute( final boolean substitute ) + { + this.substitute = substitute; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerPriority.java b/src/main/java/appeng/container/implementations/ContainerPriority.java index fb2ca8a7..fe183037 100644 --- a/src/main/java/appeng/container/implementations/ContainerPriority.java +++ b/src/main/java/appeng/container/implementations/ContainerPriority.java @@ -38,10 +38,10 @@ import appeng.util.Platform; public class ContainerPriority extends AEBaseContainer { - final IPriorityHost priHost; + private final IPriorityHost priHost; @SideOnly( Side.CLIENT ) - public GuiTextField textField; + private GuiTextField textField; @GuiSync( 2 ) public long PriorityValue = -1; diff --git a/src/main/java/appeng/container/implementations/ContainerQNB.java b/src/main/java/appeng/container/implementations/ContainerQNB.java index 1d210049..f2e5e690 100644 --- a/src/main/java/appeng/container/implementations/ContainerQNB.java +++ b/src/main/java/appeng/container/implementations/ContainerQNB.java @@ -29,14 +29,11 @@ import appeng.tile.qnb.TileQuantumBridge; public class ContainerQNB extends AEBaseContainer { - final TileQuantumBridge quantumBridge; - public ContainerQNB( final InventoryPlayer ip, final TileQuantumBridge quantumBridge ) { super( ip, quantumBridge, null ); - this.quantumBridge = quantumBridge; - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, quantumBridge, 0, 80, 37, this.invPlayer ) ).setStackLimit( 1 ) ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.QE_SINGULARITY, quantumBridge, 0, 80, 37, this.getInventoryPlayer() ) ).setStackLimit( 1 ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } diff --git a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java index 0f526848..84d8375c 100644 --- a/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java +++ b/src/main/java/appeng/container/implementations/ContainerQuartzKnife.java @@ -41,20 +41,23 @@ import appeng.util.Platform; public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngInventory, IInventory { - final QuartzKnifeObj toolInv; + private final QuartzKnifeObj toolInv; - final AppEngInternalInventory inSlot = new AppEngInternalInventory( this, 1 ); - final SlotRestrictedInput metals; - final QuartzKnifeOutput output; - String myName = ""; + private final AppEngInternalInventory inSlot = new AppEngInternalInventory( this, 1 ); + private final SlotRestrictedInput metals; + private final QuartzKnifeOutput output; + private String myName = ""; public ContainerQuartzKnife( final InventoryPlayer ip, final QuartzKnifeObj te ) { super( ip, null, null ); this.toolInv = te; - this.addSlotToContainer( this.metals = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.METAL_INGOTS, this.inSlot, 0, 94, 44, ip ) ); - this.addSlotToContainer( this.output = new QuartzKnifeOutput( this, 0, 134, 44, -1 ) ); + this.metals = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.METAL_INGOTS, this.inSlot, 0, 94, 44, ip ); + this.addSlotToContainer( this.metals ); + + this.output = new QuartzKnifeOutput( this, 0, 134, 44, -1 ); + this.addSlotToContainer( this.output ); this.lockPlayerInventorySlot( ip.currentItem ); @@ -81,12 +84,12 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurity.java b/src/main/java/appeng/container/implementations/ContainerSecurity.java index 6034c25e..8f060ddc 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurity.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurity.java @@ -43,16 +43,16 @@ import appeng.tile.misc.TileSecurity; public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppEngInventory { - final SlotRestrictedInput configSlot; + private final SlotRestrictedInput configSlot; - final AppEngInternalInventory wirelessEncoder = new AppEngInternalInventory( this, 2 ); + private final AppEngInternalInventory wirelessEncoder = new AppEngInternalInventory( this, 2 ); - final SlotRestrictedInput wirelessIn; - final SlotOutput wirelessOut; + private final SlotRestrictedInput wirelessIn; + private final SlotOutput wirelessOut; - final TileSecurity securityBox; + private final TileSecurity securityBox; @GuiSync( 0 ) - public int security = 0; + public int permissionMode = 0; public ContainerSecurity( final InventoryPlayer ip, final ITerminalHost monitorable ) { @@ -60,7 +60,7 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE this.securityBox = (TileSecurity) monitorable; - this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.configSlot, 0, 37, -33, ip ) ); + this.addSlotToContainer( this.configSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.BIOMETRIC_CARD, this.securityBox.getConfigSlot(), 0, 37, -33, ip ) ); this.addSlotToContainer( this.wirelessIn = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODABLE_ITEM, this.wirelessEncoder, 0, 212, 10, ip ) ); this.addSlotToContainer( this.wirelessOut = new SlotOutput( this.wirelessEncoder, 1, 212, 68, -1 ) ); @@ -99,7 +99,7 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE { this.verifyPermissions( SecurityPermissions.SECURITY, false ); - this.security = 0; + this.setPermissionMode( 0 ); final ItemStack a = this.configSlot.getStack(); if( a != null && a.getItem() instanceof IBiometricCard ) @@ -108,7 +108,7 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE for( final SecurityPermissions sp : bc.getPermissions( a ) ) { - this.security |= ( 1 << sp.ordinal() ); + this.setPermissionMode( this.getPermissionMode() | ( 1 << sp.ordinal() ) ); } } @@ -162,7 +162,7 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE if( networkEncodable != null ) { - networkEncodable.setEncryptionKey( term, String.valueOf( this.securityBox.securityKey ), "" ); + networkEncodable.setEncryptionKey( term, String.valueOf( this.securityBox.getSecurityKey() ), "" ); this.wirelessIn.putStack( null ); this.wirelessOut.putStack( term ); @@ -178,4 +178,14 @@ public class ContainerSecurity extends ContainerMEMonitorable implements IAEAppE } } } + + public int getPermissionMode() + { + return this.permissionMode; + } + + private void setPermissionMode( final int permissionMode ) + { + this.permissionMode = permissionMode; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/ContainerSkyChest.java index a5316eb5..ceca7123 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/ContainerSkyChest.java @@ -33,7 +33,7 @@ import appeng.tile.storage.TileSkyChest; public class ContainerSkyChest extends AEBaseContainer { - final TileSkyChest chest; + private final TileSkyChest chest; public ContainerSkyChest( final InventoryPlayer ip, final TileSkyChest chest ) { diff --git a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java index f8e39a4e..7baff6dc 100644 --- a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java @@ -37,7 +37,6 @@ import appeng.util.Platform; public class ContainerSpatialIOPort extends AEBaseContainer { - final TileSpatialIOPort spatialIOPort; @GuiSync( 0 ) public long currentPower; @GuiSync( 1 ) @@ -46,20 +45,19 @@ public class ContainerSpatialIOPort extends AEBaseContainer public long reqPower; @GuiSync( 3 ) public long eff; - IGrid network; - int delay = 40; + private IGrid network; + private int delay = 40; public ContainerSpatialIOPort( final InventoryPlayer ip, final TileSpatialIOPort spatialIOPort ) { super( ip, spatialIOPort, null ); - this.spatialIOPort = spatialIOPort; if( Platform.isServer() ) { this.network = spatialIOPort.getGridNode( ForgeDirection.UNKNOWN ).getGrid(); } - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, spatialIOPort, 0, 52, 48, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS, spatialIOPort, 0, 52, 48, this.getInventoryPlayer() ) ); this.addSlotToContainer( new SlotOutput( spatialIOPort, 1, 113, 48, SlotRestrictedInput.PlacableItemType.SPATIAL_STORAGE_CELLS.IIcon ) ); this.bindPlayerInventory( ip, 0, 197 - /* height of player inventory */82 ); @@ -81,14 +79,54 @@ public class ContainerSpatialIOPort extends AEBaseContainer final ISpatialCache sc = this.network.getCache( ISpatialCache.class ); if( eg != null ) { - this.currentPower = (long) ( 100.0 * eg.getStoredPower() ); - this.maxPower = (long) ( 100.0 * eg.getMaxStoredPower() ); - this.reqPower = (long) ( 100.0 * sc.requiredPower() ); - this.eff = (long) ( 100.0f * sc.currentEfficiency() ); + this.setCurrentPower( (long) ( 100.0 * eg.getStoredPower() ) ); + this.setMaxPower( (long) ( 100.0 * eg.getMaxStoredPower() ) ); + this.setRequiredPower( (long) ( 100.0 * sc.requiredPower() ) ); + this.setEfficency( (long) ( 100.0f * sc.currentEfficiency() ) ); } } } super.detectAndSendChanges(); } + + public long getCurrentPower() + { + return this.currentPower; + } + + private void setCurrentPower( final long currentPower ) + { + this.currentPower = currentPower; + } + + public long getMaxPower() + { + return this.maxPower; + } + + private void setMaxPower( final long maxPower ) + { + this.maxPower = maxPower; + } + + public long getRequiredPower() + { + return this.reqPower; + } + + private void setRequiredPower( final long reqPower ) + { + this.reqPower = reqPower; + } + + public long getEfficency() + { + return this.eff; + } + + private void setEfficency( final long eff ) + { + this.eff = eff; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index becf54ef..1a492739 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -47,7 +47,7 @@ import appeng.util.iterators.NullIterator; public class ContainerStorageBus extends ContainerUpgradeable { - final PartStorageBus storageBus; + private final PartStorageBus storageBus; @GuiSync( 3 ) public AccessRestriction rwMode = AccessRestriction.READ_WRITE; @@ -73,7 +73,7 @@ public class ContainerStorageBus extends ContainerUpgradeable final int xo = 8; final int yo = 23 + 6; - final IInventory config = this.upgradeable.getInventoryByName( "config" ); + final IInventory config = this.getUpgradeable().getInventoryByName( "config" ); for( int y = 0; y < 7; y++ ) { for( int x = 0; x < 9; x++ ) @@ -89,12 +89,12 @@ public class ContainerStorageBus extends ContainerUpgradeable } } - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.invPlayer ) ).setNotDraggable() ); - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.invPlayer ) ).setNotDraggable() ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 4, 187, 8 + 18 * 4, this.getInventoryPlayer() ) ).setNotDraggable() ); } @Override @@ -116,9 +116,9 @@ public class ContainerStorageBus extends ContainerUpgradeable if( Platform.isServer() ) { - this.fzMode = (FuzzyMode) this.upgradeable.getConfigManager().getSetting( Settings.FUZZY_MODE ); - this.rwMode = (AccessRestriction) this.upgradeable.getConfigManager().getSetting( Settings.ACCESS ); - this.storageFilter = (StorageFilter) this.upgradeable.getConfigManager().getSetting( Settings.STORAGE_FILTER ); + this.setFuzzyMode( (FuzzyMode) this.getUpgradeable().getConfigManager().getSetting( Settings.FUZZY_MODE ) ); + this.setReadWriteMode( (AccessRestriction) this.getUpgradeable().getConfigManager().getSetting( Settings.ACCESS ) ); + this.setStorageFilter( (StorageFilter) this.getUpgradeable().getConfigManager().getSetting( Settings.STORAGE_FILTER ) ); } this.standardDetectAndSendChanges(); @@ -127,14 +127,14 @@ public class ContainerStorageBus extends ContainerUpgradeable @Override public boolean isSlotEnabled( final int idx ) { - final int upgrades = this.upgradeable.getInstalledUpgrades( Upgrades.CAPACITY ); + final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY ); return upgrades > idx; } public void clear() { - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); for( int x = 0; x < inv.getSizeInventory(); x++ ) { inv.setInventorySlotContents( x, null ); @@ -144,7 +144,7 @@ public class ContainerStorageBus extends ContainerUpgradeable public void partition() { - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); final IMEInventory cellInv = this.storageBus.getInternalHandler(); @@ -171,4 +171,24 @@ public class ContainerStorageBus extends ContainerUpgradeable this.detectAndSendChanges(); } + + public AccessRestriction getReadWriteMode() + { + return this.rwMode; + } + + private void setReadWriteMode( final AccessRestriction rwMode ) + { + this.rwMode = rwMode; + } + + public StorageFilter getStorageFilter() + { + return this.storageFilter; + } + + private void setStorageFilter( final StorageFilter storageFilter ) + { + this.storageFilter = storageFilter; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index 6c8af4ab..bbe7a669 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -52,7 +52,7 @@ import appeng.util.Platform; public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSlotHost { - final IUpgradeableHost upgradeable; + private final IUpgradeableHost upgradeable; @GuiSync( 0 ) public RedstoneMode rsMode = RedstoneMode.IGNORE; @GuiSync( 1 ) @@ -61,8 +61,8 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl public YesNo cMode = YesNo.NO; @GuiSync( 6 ) public SchedulingMode schedulingMode = SchedulingMode.DEFAULT; - int tbSlot; - NetworkToolViewer tbInventory; + private int tbSlot; + private NetworkToolViewer tbInventory; public ContainerUpgradeable( final InventoryPlayer ip, final IUpgradeableHost te ) { @@ -111,7 +111,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { for( int u = 0; u < 3; u++ ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, this.tbInventory, u + v * 3, 186 + u * 18, this.getHeight() - 82 + v * 18, this.invPlayer ) ).setPlayerSide() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, this.tbInventory, u + v * 3, 186 + u * 18, this.getHeight() - 82 + v * 18, this.getInventoryPlayer() ) ).setPlayerSide() ); } } } @@ -135,7 +135,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl { this.setupUpgrades(); - final IInventory inv = this.upgradeable.getInventoryByName( "config" ); + final IInventory inv = this.getUpgradeable().getInventoryByName( "config" ); final int y = 40; final int x = 80; this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) ); @@ -156,22 +156,22 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl protected void setupUpgrades() { - final IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" ); + final IInventory upgrades = this.getUpgradeable().getInventoryByName( "upgrades" ); if( this.availableUpgrades() > 0 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 1 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 2 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.getInventoryPlayer() ) ).setNotDraggable() ); } if( this.availableUpgrades() > 3 ) { - this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.invPlayer ) ).setNotDraggable() ); + this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 3, 187, 8 + 18 * 3, this.getInventoryPlayer() ) ).setNotDraggable() ); } } @@ -192,7 +192,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl if( Platform.isServer() ) { - final IConfigManager cm = this.upgradeable.getConfigManager(); + final IConfigManager cm = this.getUpgradeable().getConfigManager(); this.loadSettingsFromHost( cm ); } @@ -215,16 +215,16 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl protected void loadSettingsFromHost( final IConfigManager cm ) { - this.fzMode = (FuzzyMode) cm.getSetting( Settings.FUZZY_MODE ); - this.rsMode = (RedstoneMode) cm.getSetting( Settings.REDSTONE_CONTROLLED ); - if( this.upgradeable instanceof PartExportBus ) + this.setFuzzyMode( (FuzzyMode) cm.getSetting( Settings.FUZZY_MODE ) ); + this.setRedStoneMode( (RedstoneMode) cm.getSetting( Settings.REDSTONE_CONTROLLED ) ); + if( this.getUpgradeable() instanceof PartExportBus ) { - this.cMode = (YesNo) cm.getSetting( Settings.CRAFT_ONLY ); - this.schedulingMode = (SchedulingMode) cm.getSetting( Settings.SCHEDULING_MODE ); + this.setCraftingMode( (YesNo) cm.getSetting( Settings.CRAFT_ONLY ) ); + this.setSchedulingMode( (SchedulingMode) cm.getSetting( Settings.SCHEDULING_MODE ) ); } } - public void checkToolbox() + private void checkToolbox() { if( this.hasToolbox() ) { @@ -240,12 +240,12 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } else { - this.isContainerValid = false; + this.setValidContainer( false ); } } } @@ -259,7 +259,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl @Override public boolean isSlotEnabled( final int idx ) { - final int upgrades = this.upgradeable.getInstalledUpgrades( Upgrades.CAPACITY ); + final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY ); if( idx == 1 && upgrades > 0 ) { @@ -272,4 +272,49 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl return false; } + + public FuzzyMode getFuzzyMode() + { + return this.fzMode; + } + + void setFuzzyMode( final FuzzyMode fzMode ) + { + this.fzMode = fzMode; + } + + public YesNo getCraftingMode() + { + return this.cMode; + } + + public void setCraftingMode( final YesNo cMode ) + { + this.cMode = cMode; + } + + public RedstoneMode getRedStoneMode() + { + return this.rsMode; + } + + void setRedStoneMode( final RedstoneMode rsMode ) + { + this.rsMode = rsMode; + } + + public SchedulingMode getSchedulingMode() + { + return this.schedulingMode; + } + + private void setSchedulingMode( final SchedulingMode schedulingMode ) + { + this.schedulingMode = schedulingMode; + } + + IUpgradeableHost getUpgradeable() + { + return this.upgradeable; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java index 520caa8b..bfb1126e 100644 --- a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java +++ b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java @@ -33,8 +33,8 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr { private static final int MAX_BURN_TIME = 200; - public final int aePerTick = 5; - final TileVibrationChamber vibrationChamber; + private final int aePerTick = 5; + private final TileVibrationChamber vibrationChamber; @GuiSync( 0 ) public int burnProgress = 0; @GuiSync( 1 ) @@ -45,7 +45,7 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr super( ip, vibrationChamber, null ); this.vibrationChamber = vibrationChamber; - this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.FUEL, vibrationChamber, 0, 80, 37, this.invPlayer ) ); + this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.FUEL, vibrationChamber, 0, 80, 37, this.getInventoryPlayer() ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } @@ -55,8 +55,8 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr { if( Platform.isServer() ) { - this.burnProgress = (int) ( this.vibrationChamber.maxBurnTime <= 0 ? 0 : 12 * this.vibrationChamber.burnTime / this.vibrationChamber.maxBurnTime ); - this.burnSpeed = this.vibrationChamber.burnSpeed; + this.burnProgress = (int) ( this.vibrationChamber.getMaxBurnTime() <= 0 ? 0 : 12 * this.vibrationChamber.getBurnTime() / this.vibrationChamber.getMaxBurnTime() ); + this.burnSpeed = this.vibrationChamber.getBurnSpeed(); } super.detectAndSendChanges(); @@ -73,4 +73,9 @@ public class ContainerVibrationChamber extends AEBaseContainer implements IProgr { return MAX_BURN_TIME; } + + public int getAePerTick() + { + return this.aePerTick; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/ContainerWireless.java index eaff7e62..311eccc5 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/ContainerWireless.java @@ -31,8 +31,8 @@ import appeng.tile.networking.TileWireless; public class ContainerWireless extends AEBaseContainer { - final TileWireless wirelessTerminal; - final SlotRestrictedInput boosterSlot; + private final TileWireless wirelessTerminal; + private final SlotRestrictedInput boosterSlot; @GuiSync( 1 ) public long range = 0; @GuiSync( 2 ) @@ -43,7 +43,7 @@ public class ContainerWireless extends AEBaseContainer super( ip, te, null ); this.wirelessTerminal = te; - this.addSlotToContainer( this.boosterSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, this.wirelessTerminal, 0, 80, 47, this.invPlayer ) ); + this.addSlotToContainer( this.boosterSlot = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.RANGE_BOOSTER, this.wirelessTerminal, 0, 80, 47, this.getInventoryPlayer() ) ); this.bindPlayerInventory( ip, 0, 166 - /* height of player inventory */82 ); } @@ -53,9 +53,29 @@ public class ContainerWireless extends AEBaseContainer { final int boosters = this.boosterSlot.getStack() == null ? 0 : this.boosterSlot.getStack().stackSize; - this.range = (long) ( 10 * AEConfig.instance.wireless_getMaxRange( boosters ) ); - this.drain = (long) ( 100 * AEConfig.instance.wireless_getPowerDrain( boosters ) ); + this.setRange( (long) ( 10 * AEConfig.instance.wireless_getMaxRange( boosters ) ) ); + this.setDrain( (long) ( 100 * AEConfig.instance.wireless_getPowerDrain( boosters ) ) ); super.detectAndSendChanges(); } + + public long getRange() + { + return this.range; + } + + private void setRange( final long range ) + { + this.range = range; + } + + public long getDrain() + { + return this.drain; + } + + private void setDrain( final long drain ) + { + this.drain = drain; + } } diff --git a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java index 789da90e..46e76633 100644 --- a/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerWirelessTerm.java @@ -30,7 +30,7 @@ import appeng.util.Platform; public class ContainerWirelessTerm extends ContainerMEPortableCell { - final WirelessTerminalGuiObject wirelessTerminalGUIObject; + private final WirelessTerminalGuiObject wirelessTerminalGUIObject; public ContainerWirelessTerm( final InventoryPlayer ip, final WirelessTerminalGuiObject gui ) { @@ -45,16 +45,16 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell if( !this.wirelessTerminalGUIObject.rangeCheck() ) { - if( Platform.isServer() && this.isContainerValid ) + if( Platform.isServer() && this.isValidContainer() ) { this.getPlayerInv().player.addChatMessage( PlayerMessages.OutOfRange.get() ); } - this.isContainerValid = false; + this.setValidContainer( false ); } else { - this.powerMultiplier = AEConfig.instance.wireless_getDrainRate( this.wirelessTerminalGUIObject.getRange() ); + this.setPowerMultiplier( AEConfig.instance.wireless_getDrainRate( this.wirelessTerminalGUIObject.getRange() ) ); } } } diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java index adcb1a95..94dfc183 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java +++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java @@ -28,10 +28,10 @@ import appeng.util.ItemSorters; public class CraftingCPURecord implements Comparable { - public final String myName; - final ICraftingCPU cpu; - final long size; - final int processors; + private final String myName; + private final ICraftingCPU cpu; + private final long size; + private final int processors; public CraftingCPURecord( final long size, final int coProcessors, final ICraftingCPU server ) { @@ -44,11 +44,31 @@ public class CraftingCPURecord implements Comparable @Override public int compareTo( @Nonnull final CraftingCPURecord o ) { - final int a = ItemSorters.compareLong( o.processors, this.processors ); + final int a = ItemSorters.compareLong( o.getProcessors(), this.getProcessors() ); if( a != 0 ) { return a; } - return ItemSorters.compareLong( o.size, this.size ); + return ItemSorters.compareLong( o.getSize(), this.getSize() ); + } + + ICraftingCPU getCpu() + { + return this.cpu; + } + + String getName() + { + return this.myName; + } + + int getProcessors() + { + return this.processors; + } + + long getSize() + { + return this.size; } } \ No newline at end of file diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index 60598271..120e3e69 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -31,26 +31,26 @@ import appeng.tile.inventory.AppEngInternalInventory; public class AppEngSlot extends Slot { - public final int defX; - public final int defY; - public boolean isDraggable = true; - public boolean isPlayerSide = false; - public AEBaseContainer myContainer = null; - public int IIcon = -1; - public hasCalculatedValidness isValid; - public boolean isDisplay = false; + private final int defX; + private final int defY; + private boolean isDraggable = true; + private boolean isPlayerSide = false; + private AEBaseContainer myContainer = null; + private int IIcon = -1; + private hasCalculatedValidness isValid; + private boolean isDisplay = false; public AppEngSlot( final IInventory inv, final int idx, final int x, final int y ) { super( inv, idx, x, y ); this.defX = x; this.defY = y; - this.isValid = hasCalculatedValidness.NotAvailable; + this.setIsValid( hasCalculatedValidness.NotAvailable ); } public Slot setNotDraggable() { - this.isDraggable = false; + this.setDraggable( false ); return this; } @@ -93,9 +93,9 @@ public class AppEngSlot extends Slot return null; } - if( this.isDisplay ) + if( this.isDisplay() ) { - this.isDisplay = false; + this.setDisplay( false ); return this.getDisplayStack(); } return super.getStack(); @@ -108,9 +108,9 @@ public class AppEngSlot extends Slot { super.putStack( par1ItemStack ); - if( this.myContainer != null ) + if( this.getContainer() != null ) { - this.myContainer.onSlotChange( this ); + this.getContainer().onSlotChange( this ); } } } @@ -127,7 +127,7 @@ public class AppEngSlot extends Slot super.onSlotChanged(); } - this.isValid = hasCalculatedValidness.NotAvailable; + this.setIsValid( hasCalculatedValidness.NotAvailable ); } @Override @@ -168,7 +168,7 @@ public class AppEngSlot extends Slot public int getIcon() { - return this.IIcon; + return this.getIIcon(); } public boolean isPlayerSide() @@ -181,6 +181,71 @@ public class AppEngSlot extends Slot return this.isEnabled(); } + public int getX() + { + return this.defX; + } + + public int getY() + { + return this.defY; + } + + private int getIIcon() + { + return this.IIcon; + } + + public void setIIcon( final int iIcon ) + { + this.IIcon = iIcon; + } + + private boolean isDisplay() + { + return this.isDisplay; + } + + public void setDisplay( final boolean isDisplay ) + { + this.isDisplay = isDisplay; + } + + public boolean isDraggable() + { + return this.isDraggable; + } + + private void setDraggable( final boolean isDraggable ) + { + this.isDraggable = isDraggable; + } + + void setPlayerSide( final boolean isPlayerSide ) + { + this.isPlayerSide = isPlayerSide; + } + + public hasCalculatedValidness getIsValid() + { + return this.isValid; + } + + public void setIsValid( final hasCalculatedValidness isValid ) + { + this.isValid = isValid; + } + + AEBaseContainer getContainer() + { + return this.myContainer; + } + + public void setContainer( final AEBaseContainer myContainer ) + { + this.myContainer = myContainer; + } + public enum hasCalculatedValidness { NotAvailable, Valid, Invalid diff --git a/src/main/java/appeng/container/slot/OptionalSlotFake.java b/src/main/java/appeng/container/slot/OptionalSlotFake.java index 9bbc8a5d..d2e5d3a6 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotFake.java +++ b/src/main/java/appeng/container/slot/OptionalSlotFake.java @@ -26,19 +26,17 @@ import net.minecraft.item.ItemStack; public class OptionalSlotFake extends SlotFake { - public final int srcX; - public final int srcY; - final int invSlot; - final int groupNum; - final IOptionalSlotHost host; - public boolean renderDisabled = true; + private final int srcX; + private final int srcY; + private final int groupNum; + private final IOptionalSlotHost host; + private boolean renderDisabled = true; public OptionalSlotFake( final IInventory inv, final IOptionalSlotHost containerBus, final int idx, final int x, final int y, final int offX, final int offY, final int groupNum ) { super( inv, idx, x + offX * 18, y + offY * 18 ); this.srcX = x; this.srcY = y; - this.invSlot = idx; this.groupNum = groupNum; this.host = containerBus; } @@ -69,7 +67,27 @@ public class OptionalSlotFake extends SlotFake } public boolean renderDisabled() + { + return this.isRenderDisabled(); + } + + private boolean isRenderDisabled() { return this.renderDisabled; } + + public void setRenderDisabled( final boolean renderDisabled ) + { + this.renderDisabled = renderDisabled; + } + + public int getSourceX() + { + return this.srcX; + } + + public int getSourceY() + { + return this.srcY; + } } diff --git a/src/main/java/appeng/container/slot/OptionalSlotNormal.java b/src/main/java/appeng/container/slot/OptionalSlotNormal.java index 7edd1dc8..95247c9e 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotNormal.java +++ b/src/main/java/appeng/container/slot/OptionalSlotNormal.java @@ -25,8 +25,8 @@ import net.minecraft.inventory.IInventory; public class OptionalSlotNormal extends AppEngSlot { - final int groupNum; - final IOptionalSlotHost host; + private final int groupNum; + private final IOptionalSlotHost host; public OptionalSlotNormal( final IInventory inv, final IOptionalSlotHost containerBus, final int slot, final int xPos, final int yPos, final int groupNum ) { diff --git a/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java b/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java index 175b7ed5..a9c994af 100644 --- a/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/OptionalSlotRestrictedInput.java @@ -26,8 +26,8 @@ import net.minecraft.inventory.IInventory; public class OptionalSlotRestrictedInput extends SlotRestrictedInput { - final int groupNum; - final IOptionalSlotHost host; + private final int groupNum; + private final IOptionalSlotHost host; public OptionalSlotRestrictedInput( final PlacableItemType valid, final IInventory i, final IOptionalSlotHost host, final int slotIndex, final int x, final int y, final int grpNum, final InventoryPlayer invPlayer ) { diff --git a/src/main/java/appeng/container/slot/SlotCraftingMatrix.java b/src/main/java/appeng/container/slot/SlotCraftingMatrix.java index 923a0874..e87320a5 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingMatrix.java +++ b/src/main/java/appeng/container/slot/SlotCraftingMatrix.java @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; public class SlotCraftingMatrix extends AppEngSlot { - final Container c; + private final Container c; public SlotCraftingMatrix( final Container c, final IInventory par1iInventory, final int par2, final int par3, final int par4 ) { diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index ae285621..b1a5724d 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -49,8 +49,8 @@ import appeng.util.item.AEItemStack; public class SlotCraftingTerm extends AppEngCraftingSlot { - protected final IInventory craftInv; - protected final IInventory pattern; + private final IInventory craftInv; + private final IInventory pattern; private final BaseActionSource mySrc; private final IEnergySource energySrc; @@ -147,19 +147,19 @@ public class SlotCraftingTerm extends AppEngCraftingSlot } } - protected int capCraftingAttempts( final int maxTimesToCraft ) + private int capCraftingAttempts( final int maxTimesToCraft ) { return maxTimesToCraft; } - public ItemStack craftItem( final EntityPlayer p, final ItemStack request, final IMEMonitor inv, final IItemList all ) + private ItemStack craftItem( final EntityPlayer p, final ItemStack request, final IMEMonitor inv, final IItemList all ) { // update crafting matrix... ItemStack is = this.getStack(); if( is != null && Platform.isSameItem( request, is ) ) { - final ItemStack[] set = new ItemStack[this.pattern.getSizeInventory()]; + final ItemStack[] set = new ItemStack[this.getPattern().getSizeInventory()]; // add one of each item to the items on the board... if( Platform.isServer() ) @@ -167,7 +167,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 ); for( int x = 0; x < 9; x++ ) { - ic.setInventorySlotContents( x, this.pattern.getStackInSlot( x ) ); + ic.setInventorySlotContents( x, this.getPattern().getStackInSlot( x ) ); } final IRecipe r = Platform.findMatchingRecipe( ic, p.worldObj ); @@ -205,11 +205,11 @@ public class SlotCraftingTerm extends AppEngCraftingSlot if( inv != null ) { - for( int x = 0; x < this.pattern.getSizeInventory(); x++ ) + for( int x = 0; x < this.getPattern().getSizeInventory(); x++ ) { - if( this.pattern.getStackInSlot( x ) != null ) + if( this.getPattern().getStackInSlot( x ) != null ) { - set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.worldObj, r, is, ic, this.pattern.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) ); + set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.worldObj, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) ); ic.setInventorySlotContents( x, set[x] ); } } @@ -232,17 +232,17 @@ public class SlotCraftingTerm extends AppEngCraftingSlot return null; } - public boolean preCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) + private boolean preCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) { return true; } - public void makeItem( final EntityPlayer p, final ItemStack is ) + private void makeItem( final EntityPlayer p, final ItemStack is ) { super.onPickupFromSlot( p, is ); } - public void postCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) + private void postCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) { final List drops = new ArrayList(); @@ -273,4 +273,9 @@ public class SlotCraftingTerm extends AppEngCraftingSlot Platform.spawnDrops( p.worldObj, (int) p.posX, (int) p.posY, (int) p.posZ, drops ); } } + + IInventory getPattern() + { + return this.pattern; + } } diff --git a/src/main/java/appeng/container/slot/SlotFake.java b/src/main/java/appeng/container/slot/SlotFake.java index ee389b6a..28807ee0 100644 --- a/src/main/java/appeng/container/slot/SlotFake.java +++ b/src/main/java/appeng/container/slot/SlotFake.java @@ -27,12 +27,9 @@ import net.minecraft.item.ItemStack; public class SlotFake extends AppEngSlot { - final int invSlot; - public SlotFake( final IInventory inv, final int idx, final int x, final int y ) { super( inv, idx, x, y ); - this.invSlot = idx; } @Override diff --git a/src/main/java/appeng/container/slot/SlotInaccessible.java b/src/main/java/appeng/container/slot/SlotInaccessible.java index 968e3171..b385a9c5 100644 --- a/src/main/java/appeng/container/slot/SlotInaccessible.java +++ b/src/main/java/appeng/container/slot/SlotInaccessible.java @@ -27,7 +27,7 @@ import net.minecraft.item.ItemStack; public class SlotInaccessible extends AppEngSlot { - ItemStack dspStack = null; + private ItemStack dspStack = null; public SlotInaccessible( final IInventory i, final int slotIdx, final int x, final int y ) { diff --git a/src/main/java/appeng/container/slot/SlotMACPattern.java b/src/main/java/appeng/container/slot/SlotMACPattern.java index ad8eef12..9ee53b8d 100644 --- a/src/main/java/appeng/container/slot/SlotMACPattern.java +++ b/src/main/java/appeng/container/slot/SlotMACPattern.java @@ -28,7 +28,7 @@ import appeng.container.implementations.ContainerMAC; public class SlotMACPattern extends AppEngSlot { - final ContainerMAC mac; + private final ContainerMAC mac; public SlotMACPattern( final ContainerMAC mac, final IInventory i, final int slotIdx, final int x, final int y ) { diff --git a/src/main/java/appeng/container/slot/SlotOutput.java b/src/main/java/appeng/container/slot/SlotOutput.java index 191291f2..3c662433 100644 --- a/src/main/java/appeng/container/slot/SlotOutput.java +++ b/src/main/java/appeng/container/slot/SlotOutput.java @@ -29,7 +29,7 @@ public class SlotOutput extends AppEngSlot public SlotOutput( final IInventory a, final int b, final int c, final int d, final int i ) { super( a, b, c, d ); - this.IIcon = i; + this.setIIcon( i ); } @Override diff --git a/src/main/java/appeng/container/slot/SlotPatternTerm.java b/src/main/java/appeng/container/slot/SlotPatternTerm.java index 332d3dae..6f6e0944 100644 --- a/src/main/java/appeng/container/slot/SlotPatternTerm.java +++ b/src/main/java/appeng/container/slot/SlotPatternTerm.java @@ -37,8 +37,8 @@ import appeng.helpers.IContainerCraftingPacket; public class SlotPatternTerm extends SlotCraftingTerm { - final int groupNum; - final IOptionalSlotHost host; + private final int groupNum; + private final IOptionalSlotHost host; public SlotPatternTerm( final EntityPlayer player, final BaseActionSource mySrc, final IEnergySource energySrc, final IStorageMonitorable storage, final IInventory cMatrix, final IInventory secondMatrix, final IInventory output, final int x, final int y, final IOptionalSlotHost h, final int groupNumber, final IContainerCraftingPacket c ) { @@ -50,7 +50,7 @@ public class SlotPatternTerm extends SlotCraftingTerm public AppEngPacket getRequest( final boolean shift ) throws IOException { - return new PacketPatternSlot( this.pattern, AEApi.instance().storage().createItemStack( this.getStack() ), shift ); + return new PacketPatternSlot( this.getPattern(), AEApi.instance().storage().createItemStack( this.getStack() ), shift ); } @Override diff --git a/src/main/java/appeng/container/slot/SlotPlayerHotBar.java b/src/main/java/appeng/container/slot/SlotPlayerHotBar.java index 3ec5c234..aba5e52c 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerHotBar.java +++ b/src/main/java/appeng/container/slot/SlotPlayerHotBar.java @@ -28,6 +28,6 @@ public class SlotPlayerHotBar extends AppEngSlot public SlotPlayerHotBar( final IInventory par1iInventory, final int par2, final int par3, final int par4 ) { super( par1iInventory, par2, par3, par4 ); - this.isPlayerSide = true; + this.setPlayerSide( true ); } } diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/SlotPlayerInv.java index a8607e0a..5c5d3494 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/src/main/java/appeng/container/slot/SlotPlayerInv.java @@ -31,6 +31,6 @@ public class SlotPlayerInv extends AppEngSlot { super( par1iInventory, par2, par3, par4 ); - this.isPlayerSide = true; + this.setPlayerSide( true ); } } diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 7d1ca8d8..23c26f73 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -54,16 +54,16 @@ import appeng.util.Platform; public class SlotRestrictedInput extends AppEngSlot { - public final PlacableItemType which; + private final PlacableItemType which; private final InventoryPlayer p; - public boolean allowEdit = true; - public int stackLimit = -1; + private boolean allowEdit = true; + private int stackLimit = -1; public SlotRestrictedInput( final PlacableItemType valid, final IInventory i, final int slotIndex, final int x, final int y, final InventoryPlayer p ) { super( i, slotIndex, x, y ); this.which = valid; - this.IIcon = valid.IIcon; + this.setIIcon( valid.IIcon ); this.p = p; } @@ -96,7 +96,7 @@ public class SlotRestrictedInput extends AppEngSlot @Override public boolean isItemValid( final ItemStack i ) { - if( !this.myContainer.isValidForSlot( this, i ) ) + if( !this.getContainer().isValidForSlot( this, i ) ) { return false; } @@ -115,7 +115,7 @@ public class SlotRestrictedInput extends AppEngSlot return false; } - if( !this.allowEdit ) + if( !this.isAllowEdit() ) { return false; } @@ -234,7 +234,7 @@ public class SlotRestrictedInput extends AppEngSlot @Override public boolean canTakeStack( final EntityPlayer par1EntityPlayer ) { - return this.allowEdit; + return this.isAllowEdit(); } @Override @@ -277,6 +277,16 @@ public class SlotRestrictedInput extends AppEngSlot return false; } + private boolean isAllowEdit() + { + return this.allowEdit; + } + + public void setAllowEdit( final boolean allowEdit ) + { + this.allowEdit = allowEdit; + } + public enum PlacableItemType { STORAGE_CELLS( 15 ), ORE( 16 + 15 ), STORAGE_COMPONENT( 3 * 16 + 15 ), diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index e9b592a2..820d7ee0 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -70,7 +70,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject public float spawnChargedChance = 0.92f; public int quartzOresPerCluster = 4; public int quartzOresClusterAmount = 15; - public int chargedChange = 4; + public final int chargedChange = 4; public int minMeteoriteDistance = 707; public int minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance; public double spatialPowerExponent = 1.35; diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java index 7795c0fe..90a900ca 100644 --- a/src/main/java/appeng/core/AELog.java +++ b/src/main/java/appeng/core/AELog.java @@ -101,7 +101,7 @@ public final class AELog } } - public static void debug( String format, Object... data ) + public static void debug( final String format, final Object... data ) { if( AEConfig.instance.isFeatureEnabled( AEFeature.DebugLogging ) ) { diff --git a/src/main/java/appeng/core/ApiDefinitions.java b/src/main/java/appeng/core/ApiDefinitions.java index 2a44fc33..d20d53c5 100644 --- a/src/main/java/appeng/core/ApiDefinitions.java +++ b/src/main/java/appeng/core/ApiDefinitions.java @@ -53,12 +53,12 @@ public final class ApiDefinitions implements IDefinitions this.parts = new ApiParts( constructor, partHelper ); } - public FeatureHandlerRegistry getFeatureHandlerRegistry() + FeatureHandlerRegistry getFeatureHandlerRegistry() { return this.handlers; } - public FeatureRegistry getFeatureRegistry() + FeatureRegistry getFeatureRegistry() { return this.features; } diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 1d87b159..2a31a645 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -182,9 +182,9 @@ public final class AppEng final Stopwatch start = Stopwatch.createStarted(); AELog.info( "Initialization ( started )" ); - if( exportConfig.isExportingItemNamesEnabled() ) + if( this.exportConfig.isExportingItemNamesEnabled() ) { - final ExportProcess process = new ExportProcess( this.recipeDirectory, exportConfig ); + final ExportProcess process = new ExportProcess( this.recipeDirectory, this.exportConfig ); final Thread exportProcessThread = new Thread( process ); this.startService( "AE2 CSV Export", exportProcessThread ); diff --git a/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java index 5568aa1b..1eecf815 100644 --- a/src/main/java/appeng/core/CreativeTab.java +++ b/src/main/java/appeng/core/CreativeTab.java @@ -41,7 +41,7 @@ public final class CreativeTab extends CreativeTabs super( "appliedenergistics2" ); } - public static void init() + static void init() { instance = new CreativeTab(); } diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index 9ecb28b5..4ad0f2fa 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -40,7 +40,7 @@ public final class CreativeTabFacade extends CreativeTabs super( "appliedenergistics2.facades" ); } - public static void init() + static void init() { instance = new CreativeTabFacade(); } diff --git a/src/main/java/appeng/core/FacadeConfig.java b/src/main/java/appeng/core/FacadeConfig.java index 5ff1d247..c493cc35 100644 --- a/src/main/java/appeng/core/FacadeConfig.java +++ b/src/main/java/appeng/core/FacadeConfig.java @@ -35,7 +35,7 @@ public class FacadeConfig extends Configuration { public static FacadeConfig instance; - final Pattern replacementPattern; + private final Pattern replacementPattern; public FacadeConfig( final File facadeFile ) { diff --git a/src/main/java/appeng/core/FeatureHandlerRegistry.java b/src/main/java/appeng/core/FeatureHandlerRegistry.java index 2464b3b7..e52cb8ac 100644 --- a/src/main/java/appeng/core/FeatureHandlerRegistry.java +++ b/src/main/java/appeng/core/FeatureHandlerRegistry.java @@ -34,7 +34,7 @@ public final class FeatureHandlerRegistry this.registry.add( feature ); } - public Set getRegisteredFeatureHandlers() + Set getRegisteredFeatureHandlers() { return this.registry; } diff --git a/src/main/java/appeng/core/FeatureRegistry.java b/src/main/java/appeng/core/FeatureRegistry.java index 4991f1d7..5405cab8 100644 --- a/src/main/java/appeng/core/FeatureRegistry.java +++ b/src/main/java/appeng/core/FeatureRegistry.java @@ -34,7 +34,7 @@ public final class FeatureRegistry this.registry.add( feature ); } - public Set getRegisteredFeatures() + Set getRegisteredFeatures() { return this.registry; } diff --git a/src/main/java/appeng/core/IMCHandler.java b/src/main/java/appeng/core/IMCHandler.java index aa73b796..a52906fb 100644 --- a/src/main/java/appeng/core/IMCHandler.java +++ b/src/main/java/appeng/core/IMCHandler.java @@ -75,7 +75,7 @@ public class IMCHandler * * @param event Event carrying the identifier and message for the handlers */ - public void handleIMCEvent( final FMLInterModComms.IMCEvent event ) + void handleIMCEvent( final FMLInterModComms.IMCEvent event ) { for( final FMLInterModComms.IMCMessage message : event.getMessages() ) { diff --git a/src/main/java/appeng/core/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java index 1b9a2464..a7314db5 100644 --- a/src/main/java/appeng/core/RecipeLoader.java +++ b/src/main/java/appeng/core/RecipeLoader.java @@ -92,7 +92,7 @@ public class RecipeLoader implements Runnable FileUtils.cleanDirectory( generatedRecipesDir ); copier.copyTo( ".recipe", generatedRecipesDir ); - copier.copyTo( ".html", recipeDirectory ); + copier.copyTo( ".html", this.recipeDirectory ); // parse recipes prioritising the user scripts by using the generated as template this.handler.parseRecipes( new ConfigLoader( generatedRecipesDir, userRecipesDir ), "index.recipe" ); diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 845ea8a4..7d3d56af 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -138,7 +138,7 @@ public final class Registration return this.storageBiome; } - public void preInitialize( final FMLPreInitializationEvent event ) + void preInitialize( final FMLPreInitializationEvent event ) { this.registerSpatial( false ); @@ -512,7 +512,7 @@ public final class Registration target.itemLumenPaintBall = source.coloredLumenPaintBall(); } - public void initialize( @Nonnull final FMLInitializationEvent event, @Nonnull final File recipeDirectory, @Nonnull final CustomRecipeConfig customRecipeConfig ) + void initialize( @Nonnull final FMLInitializationEvent event, @Nonnull final File recipeDirectory, @Nonnull final CustomRecipeConfig customRecipeConfig ) { Preconditions.checkNotNull( event ); Preconditions.checkNotNull( recipeDirectory ); @@ -581,7 +581,7 @@ public final class Registration } } - public void postInit( final FMLPostInitializationEvent event ) + void postInit( final FMLPostInitializationEvent event ) { this.registerSpatial( true ); diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index a77d1c44..1385dbc8 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -146,7 +146,7 @@ public class ApiPart implements IPartHelper return myCLass; } - public Class getClassByDesc( final String addendum, final String fullPath, final String root, final String next ) + private Class getClassByDesc( final String addendum, final String fullPath, final String root, final String next ) { if( this.roots.get( fullPath ) != null ) { @@ -236,7 +236,7 @@ public class ApiPart implements IPartHelper return clazz; } - public ClassNode getReader( final String name ) + private ClassNode getReader( final String name ) { final String path = '/' + name.replace( ".", "/" ) + ".class"; final InputStream is = this.getClass().getResourceAsStream( path ); @@ -348,10 +348,10 @@ public class ApiPart implements IPartHelper return CommonHelper.proxy.getRenderMode(); } - static class DefaultPackageClassNameRemapper extends Remapper + private static class DefaultPackageClassNameRemapper extends Remapper { - public final HashMap inputOutput = new HashMap(); + private final HashMap inputOutput = new HashMap(); @Override public String map( final String typeName ) diff --git a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java index 63d83422..c7170fb5 100644 --- a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java +++ b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java @@ -48,7 +48,7 @@ public class DefinitionConstructor this.handlers = handlers; } - public final ITileDefinition registerTileDefinition( final IAEFeature feature ) + final ITileDefinition registerTileDefinition( final IAEFeature feature ) { final IBlockDefinition definition = this.registerBlockDefinition( feature ); @@ -60,7 +60,7 @@ public class DefinitionConstructor throw new IllegalStateException( "No tile definition for " + feature ); } - public final IBlockDefinition registerBlockDefinition( final IAEFeature feature ) + final IBlockDefinition registerBlockDefinition( final IAEFeature feature ) { final IItemDefinition definition = this.registerItemDefinition( feature ); @@ -72,7 +72,7 @@ public class DefinitionConstructor throw new IllegalStateException( "No block definition for " + feature ); } - public final IItemDefinition registerItemDefinition( final IAEFeature feature ) + final IItemDefinition registerItemDefinition( final IAEFeature feature ) { final IFeatureHandler handler = feature.handler(); @@ -87,7 +87,7 @@ public class DefinitionConstructor return definition; } - public final AEColoredItemDefinition constructColoredDefinition( final IItemDefinition target, final int offset ) + final AEColoredItemDefinition constructColoredDefinition( final IItemDefinition target, final int offset ) { final ColoredItemDefinition definition = new ColoredItemDefinition(); @@ -104,7 +104,7 @@ public class DefinitionConstructor return definition; } - public final AEColoredItemDefinition constructColoredDefinition( final ItemMultiPart target, final PartType type ) + final AEColoredItemDefinition constructColoredDefinition( final ItemMultiPart target, final PartType type ) { final ColoredItemDefinition definition = new ColoredItemDefinition(); diff --git a/src/main/java/appeng/core/features/BlockStackSrc.java b/src/main/java/appeng/core/features/BlockStackSrc.java index 1f6f18a1..60f1279f 100644 --- a/src/main/java/appeng/core/features/BlockStackSrc.java +++ b/src/main/java/appeng/core/features/BlockStackSrc.java @@ -31,8 +31,8 @@ import net.minecraft.item.ItemStack; public class BlockStackSrc implements IStackSrc { - public final Block block; - public final int damage; + private final Block block; + private final int damage; private final boolean enabled; public BlockStackSrc( final Block block, final int damage, final ActivityState state ) diff --git a/src/main/java/appeng/core/features/ColoredItemDefinition.java b/src/main/java/appeng/core/features/ColoredItemDefinition.java index aef97a96..ab6486ab 100644 --- a/src/main/java/appeng/core/features/ColoredItemDefinition.java +++ b/src/main/java/appeng/core/features/ColoredItemDefinition.java @@ -31,7 +31,7 @@ import appeng.api.util.AEColoredItemDefinition; public final class ColoredItemDefinition implements AEColoredItemDefinition { - final ItemStackSrc[] colors = new ItemStackSrc[17]; + private final ItemStackSrc[] colors = new ItemStackSrc[17]; public void add( final AEColor v, final ItemStackSrc is ) { @@ -97,6 +97,6 @@ public final class ColoredItemDefinition implements AEColoredItemDefinition return false; } - return comparableItem.getItem() == is.getItem() && comparableItem.getItemDamage() == is.damage; + return comparableItem.getItem() == is.getItem() && comparableItem.getItemDamage() == is.getDamage(); } } diff --git a/src/main/java/appeng/core/features/FeaturedActiveChecker.java b/src/main/java/appeng/core/features/FeaturedActiveChecker.java index 49b5b885..623af56f 100644 --- a/src/main/java/appeng/core/features/FeaturedActiveChecker.java +++ b/src/main/java/appeng/core/features/FeaturedActiveChecker.java @@ -33,7 +33,7 @@ public final class FeaturedActiveChecker this.features = features; } - public ActivityState getActivityState() + ActivityState getActivityState() { for( final AEFeature f : this.features ) { diff --git a/src/main/java/appeng/core/features/ItemStackSrc.java b/src/main/java/appeng/core/features/ItemStackSrc.java index ae7ee32a..c263d40d 100644 --- a/src/main/java/appeng/core/features/ItemStackSrc.java +++ b/src/main/java/appeng/core/features/ItemStackSrc.java @@ -31,7 +31,7 @@ public class ItemStackSrc implements IStackSrc { private final Item item; - public final int damage; + private final int damage; private final boolean enabled; public ItemStackSrc( final Item item, final int damage, final ActivityState state ) diff --git a/src/main/java/appeng/core/features/MaterialStackSrc.java b/src/main/java/appeng/core/features/MaterialStackSrc.java index 1c09cc31..546534ea 100644 --- a/src/main/java/appeng/core/features/MaterialStackSrc.java +++ b/src/main/java/appeng/core/features/MaterialStackSrc.java @@ -47,13 +47,13 @@ public class MaterialStackSrc implements IStackSrc @Override public Item getItem() { - return this.src.itemInstance; + return this.src.getItemInstance(); } @Override public int getDamage() { - return this.src.damageValue; + return this.src.getDamageValue(); } @Override diff --git a/src/main/java/appeng/core/features/registries/CellRegistry.java b/src/main/java/appeng/core/features/registries/CellRegistry.java index 8fb1d9d0..acaf74ab 100644 --- a/src/main/java/appeng/core/features/registries/CellRegistry.java +++ b/src/main/java/appeng/core/features/registries/CellRegistry.java @@ -34,7 +34,7 @@ import appeng.api.storage.StorageChannel; public class CellRegistry implements ICellRegistry { - final List handlers; + private final List handlers; public CellRegistry() { diff --git a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java b/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java index 79a2dc1f..64ee6ed7 100644 --- a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java +++ b/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java @@ -35,8 +35,8 @@ import appeng.core.features.registries.entries.ExternalIInv; public class ExternalStorageRegistry implements IExternalStorageRegistry { - final List Handlers; - final ExternalIInv lastHandler = new ExternalIInv(); + private final List Handlers; + private final ExternalIInv lastHandler = new ExternalIInv(); public ExternalStorageRegistry() { diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index 0c1d6e65..3682f073 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java @@ -164,7 +164,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene return null; } - public void log( final String o ) + private void log( final String o ) { AELog.grinder( o ); } diff --git a/src/main/java/appeng/core/features/registries/WirelessRangeResult.java b/src/main/java/appeng/core/features/registries/WirelessRangeResult.java deleted file mode 100644 index baf16b59..00000000 --- a/src/main/java/appeng/core/features/registries/WirelessRangeResult.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.core.features.registries; - - -import net.minecraft.tileentity.TileEntity; - - -public class WirelessRangeResult -{ - - public final float dist; - public final TileEntity te; - - public WirelessRangeResult( final TileEntity t, final float d ) - { - this.dist = d; - this.te = t; - } -} diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 6c8262d1..6417c734 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -31,7 +31,7 @@ public final class WorldGenRegistry implements IWorldGen { public static final WorldGenRegistry INSTANCE = new WorldGenRegistry(); - final TypeSet[] types; + private final TypeSet[] types; private WorldGenRegistry() { diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 9384ee8b..2cdc64a1 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -65,7 +65,7 @@ public enum ButtonToolTips SchedulingMode, SchedulingModeDefault, SchedulingModeRoundRobin, SchedulingModeRandom; - final String root; + private final String root; ButtonToolTips() { diff --git a/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java index fd7d0ce5..386c05c1 100644 --- a/src/main/java/appeng/core/localization/GuiText.java +++ b/src/main/java/appeng/core/localization/GuiText.java @@ -94,7 +94,7 @@ public enum GuiText // Used in a ME Interface when no appropriate TileEntity was detected near it Nothing; - final String root; + private final String root; GuiText() { diff --git a/src/main/java/appeng/core/localization/WailaText.java b/src/main/java/appeng/core/localization/WailaText.java index b41cbcb0..3c940c4a 100644 --- a/src/main/java/appeng/core/localization/WailaText.java +++ b/src/main/java/appeng/core/localization/WailaText.java @@ -32,7 +32,7 @@ public enum WailaText Contains, Channels; - final String root; + private final String root; WailaText() { diff --git a/src/main/java/appeng/core/settings/TickRates.java b/src/main/java/appeng/core/settings/TickRates.java index 35b2930e..bc440898 100644 --- a/src/main/java/appeng/core/settings/TickRates.java +++ b/src/main/java/appeng/core/settings/TickRates.java @@ -51,20 +51,40 @@ public enum TickRates PressureTunnel( 1, 120 ); - public int min; - public int max; + private int min; + private int max; TickRates( final int min, final int max ) { - this.min = min; - this.max = max; + this.setMin( min ); + this.setMax( max ); } public void Load( final AEConfig config ) { config.addCustomCategoryComment( "TickRates", " Min / Max Tickrates for dynamic ticking, most of these components also use sleeping, to prevent constant ticking, adjust with care, non standard rates are not supported or tested." ); - this.min = config.get( "TickRates", this.name() + ".min", this.min ).getInt( this.min ); - this.max = config.get( "TickRates", this.name() + ".max", this.max ).getInt( this.max ); + this.setMin( config.get( "TickRates", this.name() + ".min", this.getMin() ).getInt( this.getMin() ) ); + this.setMax( config.get( "TickRates", this.name() + ".max", this.getMax() ).getInt( this.getMax() ) ); + } + + public int getMax() + { + return this.max; + } + + public void setMax( final int max ) + { + this.max = max; + } + + public int getMin() + { + return this.min; + } + + public void setMin( final int min ) + { + this.min = min; } } diff --git a/src/main/java/appeng/core/stats/AchievementCraftingHandler.java b/src/main/java/appeng/core/stats/AchievementCraftingHandler.java index 4a5f088b..eb063dd7 100644 --- a/src/main/java/appeng/core/stats/AchievementCraftingHandler.java +++ b/src/main/java/appeng/core/stats/AchievementCraftingHandler.java @@ -51,17 +51,17 @@ public class AchievementCraftingHandler for( final Achievements achievement : Achievements.values() ) { - switch( achievement.type ) + switch( achievement.getType() ) { case Craft: - if( Platform.isSameItemPrecise( achievement.stack, event.crafting ) ) + if( Platform.isSameItemPrecise( achievement.getStack(), event.crafting ) ) { achievement.addToPlayer( event.player ); return; } break; case CraftItem: - if( achievement.stack != null && achievement.stack.getItem().getClass() == event.crafting.getItem().getClass() ) + if( achievement.getStack() != null && achievement.getStack().getItem().getClass() == event.crafting.getItem().getClass() ) { achievement.addToPlayer( event.player ); return; diff --git a/src/main/java/appeng/core/stats/AchievementHierarchy.java b/src/main/java/appeng/core/stats/AchievementHierarchy.java index 3c07f684..cb8df680 100644 --- a/src/main/java/appeng/core/stats/AchievementHierarchy.java +++ b/src/main/java/appeng/core/stats/AchievementHierarchy.java @@ -30,7 +30,7 @@ public class AchievementHierarchy /** * Setup hierarchy through assigning parents. */ - public void registerAchievementHierarchy() + void registerAchievementHierarchy() { Achievements.Presses.setParent( Achievements.Compass ); diff --git a/src/main/java/appeng/core/stats/AchievementPickupHandler.java b/src/main/java/appeng/core/stats/AchievementPickupHandler.java index 0b460385..2c9128fe 100644 --- a/src/main/java/appeng/core/stats/AchievementPickupHandler.java +++ b/src/main/java/appeng/core/stats/AchievementPickupHandler.java @@ -55,7 +55,7 @@ public class AchievementPickupHandler for( final Achievements achievement : Achievements.values() ) { - if( achievement.type == AchievementType.Pickup && Platform.isSameItemPrecise( achievement.stack, is ) ) + if( achievement.getType() == AchievementType.Pickup && Platform.isSameItemPrecise( achievement.getStack(), is ) ) { achievement.addToPlayer( event.player ); return; diff --git a/src/main/java/appeng/core/stats/Achievements.java b/src/main/java/appeng/core/stats/Achievements.java index e436d016..3501fe68 100644 --- a/src/main/java/appeng/core/stats/Achievements.java +++ b/src/main/java/appeng/core/stats/Achievements.java @@ -106,8 +106,8 @@ public enum Achievements // done QNB( 10, 2, AEApi.instance().definitions().blocks().quantumLink(), AchievementType.Craft ); - public final ItemStack stack; - public final AchievementType type; + private final ItemStack stack; + private final AchievementType type; private final int x; private final int y; @@ -138,16 +138,16 @@ public enum Achievements this.y = y; } - public void setParent( final Achievements parent ) + void setParent( final Achievements parent ) { this.parent = parent.getAchievement(); } public Achievement getAchievement() { - if( this.stat == null && this.stack != null ) + if( this.stat == null && this.getStack() != null ) { - this.stat = new Achievement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, this.stack, this.parent ); + this.stat = new Achievement( "achievement.ae2." + this.name(), "ae2." + this.name(), this.x, this.y, this.getStack(), this.parent ); this.stat.registerStat(); } @@ -159,4 +159,14 @@ public enum Achievements player.addStat( this.getAchievement(), 1 ); } + AchievementType getType() + { + return this.type; + } + + ItemStack getStack() + { + return this.stack; + } + } diff --git a/src/main/java/appeng/core/stats/PlayerDifferentiator.java b/src/main/java/appeng/core/stats/PlayerDifferentiator.java index d4efda36..8e81ba1e 100644 --- a/src/main/java/appeng/core/stats/PlayerDifferentiator.java +++ b/src/main/java/appeng/core/stats/PlayerDifferentiator.java @@ -42,7 +42,7 @@ public class PlayerDifferentiator * * @return true if {@param player} is not a real player */ - public boolean isNoPlayer( final EntityPlayer player ) + boolean isNoPlayer( final EntityPlayer player ) { return player == null || player.isDead || player instanceof FakePlayer; } diff --git a/src/main/java/appeng/core/stats/Stats.java b/src/main/java/appeng/core/stats/Stats.java index 1a7144e7..a3fd1546 100644 --- a/src/main/java/appeng/core/stats/Stats.java +++ b/src/main/java/appeng/core/stats/Stats.java @@ -47,7 +47,7 @@ public enum Stats player.addStat( this.getStat(), howMany ); } - public StatBasic getStat() + StatBasic getStat() { if( this.stat == null ) { diff --git a/src/main/java/appeng/core/sync/AppEngPacket.java b/src/main/java/appeng/core/sync/AppEngPacket.java index e5795eef..be6e5b9a 100644 --- a/src/main/java/appeng/core/sync/AppEngPacket.java +++ b/src/main/java/appeng/core/sync/AppEngPacket.java @@ -35,7 +35,7 @@ import appeng.core.sync.network.NetworkHandler; public abstract class AppEngPacket { - AppEngPacketHandlerBase.PacketTypes id; + private AppEngPacketHandlerBase.PacketTypes id; private ByteBuf p; public void serverPacketData( final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player ) diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 9da16936..72c5756d 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -139,7 +139,7 @@ public class AppEngPacketHandlerBase return ( values() )[id]; } - public static PacketTypes getID( final Class c ) + static PacketTypes getID( final Class c ) { return REVERSE_LOOKUP.get( c ); } diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 1e163ea8..5f94a872 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -324,12 +324,12 @@ public enum GuiBridge implements IGuiHandler if( newContainer instanceof AEBaseContainer ) { final AEBaseContainer bc = (AEBaseContainer) newContainer; - bc.openContext = new ContainerOpenContext( myItem ); - bc.openContext.w = w; - bc.openContext.x = x; - bc.openContext.y = y; - bc.openContext.z = z; - bc.openContext.side = side; + bc.setOpenContext( new ContainerOpenContext( myItem ) ); + bc.getOpenContext().setWorld( w ); + bc.getOpenContext().setX( x ); + bc.getOpenContext().setY( y ); + bc.getOpenContext().setZ( z ); + bc.getOpenContext().setSide( side ); } return newContainer; diff --git a/src/main/java/appeng/core/sync/GuiHostType.java b/src/main/java/appeng/core/sync/GuiHostType.java index 6127a585..ac780028 100644 --- a/src/main/java/appeng/core/sync/GuiHostType.java +++ b/src/main/java/appeng/core/sync/GuiHostType.java @@ -28,7 +28,7 @@ public enum GuiHostType return this != WORLD; } - public boolean isTile() + boolean isTile() { return this != ITEM; } diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 279a2abb..319fba9d 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -40,11 +40,11 @@ public class NetworkHandler public static NetworkHandler instance; - final FMLEventChannel ec; - final String myChannelName; + private final FMLEventChannel ec; + private final String myChannelName; - final IPacketHandler clientHandler; - final IPacketHandler serveHandler; + private final IPacketHandler clientHandler; + private final IPacketHandler serveHandler; public NetworkHandler( final String channelName ) { diff --git a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java index 716782ba..36b12877 100644 --- a/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java +++ b/src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java @@ -40,9 +40,9 @@ import appeng.util.item.AEItemStack; public class PacketAssemblerAnimation extends AppEngPacket { - public final int x; - public final int y; - public final int z; + private final int x; + private final int y; + private final int z; public final byte rate; public final IAEItemStack is; diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index 5848ad06..ebc8b86e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -39,13 +39,13 @@ import appeng.items.tools.powered.ToolColorApplicator; public class PacketClick extends AppEngPacket { - final int x; - final int y; - final int z; - final int side; - final float hitX; - final float hitY; - final float hitZ; + private final int x; + private final int y; + private final int z; + private final int side; + private final float hitX; + private final float hitY; + private final float hitZ; // automatic. public PacketClick( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java index f1ea1825..bd8b4a98 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassRequest.java @@ -36,12 +36,12 @@ import appeng.services.compass.ICompassCallback; public class PacketCompassRequest extends AppEngPacket implements ICompassCallback { - public final long attunement; - public final int cx; - public final int cz; - public final int cdy; + final long attunement; + final int cx; + final int cz; + final int cdy; - EntityPlayer talkBackTo; + private EntityPlayer talkBackTo; // automatic. public PacketCompassRequest( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java index 9087bd92..4f90ae41 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompassResponse.java @@ -33,12 +33,12 @@ import appeng.hooks.CompassResult; public class PacketCompassResponse extends AppEngPacket { - public final long attunement; - public final int cx; - public final int cz; - public final int cdy; + private final long attunement; + private final int cx; + private final int cz; + private final int cdy; - public CompassResult cr; + private CompassResult cr; // automatic. public PacketCompassResponse( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java index 85d16657..0bf2b60d 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java +++ b/src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java @@ -48,12 +48,10 @@ public class PacketCompressedNBT extends AppEngPacket { // input. - final NBTTagCompound in; + private final NBTTagCompound in; // output... private final ByteBuf data; private final GZIPOutputStream compressFrame; - int writtenBytes = 0; - boolean empty = true; // automatic. public PacketCompressedNBT( final ByteBuf stream ) throws IOException diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java index ef5a021a..fe110cf6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java @@ -46,8 +46,8 @@ import appeng.util.Platform; public class PacketCraftRequest extends AppEngPacket { - public final long amount; - public final boolean heldShift; + private final long amount; + private final boolean heldShift; // automatic. public PacketCraftRequest( final ByteBuf stream ) @@ -87,30 +87,30 @@ public class PacketCraftRequest extends AppEngPacket } final IGrid g = gn.getGrid(); - if( g == null || cca.whatToMake == null ) + if( g == null || cca.getItemToCraft() == null ) { return; } - cca.whatToMake.setStackSize( this.amount ); + cca.getItemToCraft().setStackSize( this.amount ); Future futureJob = null; try { final ICraftingGrid cg = g.getCache( ICraftingGrid.class ); - futureJob = cg.beginCraftingJob( cca.getWorld(), cca.getGrid(), cca.getActionSrc(), cca.whatToMake, null ); + futureJob = cg.beginCraftingJob( cca.getWorld(), cca.getGrid(), cca.getActionSrc(), cca.getItemToCraft(), null ); - final ContainerOpenContext context = cca.openContext; + final ContainerOpenContext context = cca.getOpenContext(); if( context != null ) { final TileEntity te = context.getTile(); - Platform.openGUI( player, te, cca.openContext.side, GuiBridge.GUI_CRAFTING_CONFIRM ); + Platform.openGUI( player, te, cca.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_CONFIRM ); if( player.openContainer instanceof ContainerCraftConfirm ) { final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer; - ccc.autoStart = this.heldShift; - ccc.job = futureJob; + ccc.setAutoStart( this.heldShift ); + ccc.setJob( futureJob ); cca.detectAndSendChanges(); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java index 2b50625b..4f8a206f 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java @@ -44,10 +44,10 @@ import appeng.util.item.AEItemStack; public class PacketInventoryAction extends AppEngPacket { - public final InventoryAction action; - public final int slot; - public final long id; - public final IAEItemStack slotItem; + private final InventoryAction action; + private final int slot; + private final long id; + private final IAEItemStack slotItem; // automatic. public PacketInventoryAction( final ByteBuf stream ) throws IOException @@ -128,11 +128,11 @@ public class PacketInventoryAction extends AppEngPacket final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer; if( this.action == InventoryAction.AUTO_CRAFT ) { - final ContainerOpenContext context = baseContainer.openContext; + final ContainerOpenContext context = baseContainer.getOpenContext(); if( context != null ) { final TileEntity te = context.getTile(); - Platform.openGUI( sender, te, baseContainer.openContext.side, GuiBridge.GUI_CRAFTING_AMOUNT ); + Platform.openGUI( sender, te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_AMOUNT ); if( sender.openContainer instanceof ContainerCraftAmount ) { @@ -140,8 +140,8 @@ public class PacketInventoryAction extends AppEngPacket if( baseContainer.getTargetStack() != null ) { - cca.craftingItem.putStack( baseContainer.getTargetStack().getItemStack() ); - cca.whatToMake = baseContainer.getTargetStack(); + cca.getCraftingItem().putStack( baseContainer.getTargetStack().getItemStack() ); + cca.setItemToCraft( baseContainer.getTargetStack() ); } cca.detectAndSendChanges(); diff --git a/src/main/java/appeng/core/sync/packets/PacketLightning.java b/src/main/java/appeng/core/sync/packets/PacketLightning.java index 1c1c3fc0..2441ca77 100644 --- a/src/main/java/appeng/core/sync/packets/PacketLightning.java +++ b/src/main/java/appeng/core/sync/packets/PacketLightning.java @@ -39,9 +39,9 @@ import appeng.util.Platform; public class PacketLightning extends AppEngPacket { - final double x; - final double y; - final double z; + private final double x; + private final double y; + private final double z; // automatic. public PacketLightning( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java b/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java index a1929344..cbf87017 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java +++ b/src/main/java/appeng/core/sync/packets/PacketMatterCannon.java @@ -39,13 +39,13 @@ import appeng.core.sync.network.INetworkInfo; public class PacketMatterCannon extends AppEngPacket { - final double x; - final double y; - final double z; - final double dx; - final double dy; - final double dz; - final byte len; + private final double x; + private final double y; + private final double z; + private final double dx; + private final double dy; + private final double dz; + private final byte len; // automatic. public PacketMatterCannon( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java b/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java index 6536fa69..6a81da25 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java +++ b/src/main/java/appeng/core/sync/packets/PacketMockExplosion.java @@ -36,9 +36,9 @@ import appeng.core.sync.network.INetworkInfo; public class PacketMockExplosion extends AppEngPacket { - public final double x; - public final double y; - public final double z; + private final double x; + private final double y; + private final double z; // automatic. public PacketMockExplosion( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java index 74ae4184..4a117b43 100644 --- a/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java @@ -65,7 +65,7 @@ import appeng.util.prioitylist.IPartitionList; public class PacketNEIRecipe extends AppEngPacket { - ItemStack[][] recipe; + private ItemStack[][] recipe; // automatic. public PacketNEIRecipe( final ByteBuf stream ) throws IOException @@ -172,7 +172,7 @@ public class PacketNEIRecipe extends AppEngPacket final IAEItemStack in = AEItemStack.create( currentItem ); if( in != null ) { - final IAEItemStack out = realForFake == Actionable.SIMULATE ? null : Platform.poweredInsert( energy, storage, in, cct.getSource() ); + final IAEItemStack out = realForFake == Actionable.SIMULATE ? null : Platform.poweredInsert( energy, storage, in, cct.getActionSource() ); if( out != null ) { craftMatrix.setInventorySlotContents( x, out.getItemStack() ); @@ -191,7 +191,7 @@ public class PacketNEIRecipe extends AppEngPacket if( patternItem != null && currentItem == null ) { // Grab from network by recipe - ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getSource(), storage, player.worldObj, r, is, testInv, patternItem, x, all, realForFake, filter ); + ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getActionSource(), storage, player.worldObj, r, is, testInv, patternItem, x, all, realForFake, filter ); // If that doesn't get it, grab exact items from network (?) // TODO see if this code is necessary @@ -205,7 +205,7 @@ public class PacketNEIRecipe extends AppEngPacket if( filter == null || filter.isListed( request ) ) { request.setStackSize( 1 ); - final IAEItemStack out = Platform.poweredExtraction( energy, storage, request, cct.getSource() ); + final IAEItemStack out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() ); if( out != null ) { whichItem = out.getItemStack(); diff --git a/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java b/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java index 62e396d8..ddf53b84 100644 --- a/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java +++ b/src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java @@ -36,7 +36,7 @@ import appeng.core.sync.network.INetworkInfo; public class PacketNewStorageDimension extends AppEngPacket { - final int newDim; + private final int newDim; // automatic. public PacketNewStorageDimension( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java index b407c869..90380094 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java +++ b/src/main/java/appeng/core/sync/packets/PacketPartPlacement.java @@ -34,11 +34,11 @@ import appeng.parts.PartPlacement; public class PacketPartPlacement extends AppEngPacket { - int x; - int y; - int z; - int face; - float eyeHeight; + private int x; + private int y; + private int z; + private int face; + private float eyeHeight; // automatic. public PacketPartPlacement( final ByteBuf stream ) @@ -70,7 +70,7 @@ public class PacketPartPlacement extends AppEngPacket { final EntityPlayerMP sender = (EntityPlayerMP) player; CommonHelper.proxy.updateRenderMode( sender ); - PartPlacement.eyeHeight = this.eyeHeight; + PartPlacement.setEyeHeight( this.eyeHeight ); PartPlacement.place( sender.getHeldItem(), this.x, this.y, this.z, this.face, sender, sender.worldObj, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 ); CommonHelper.proxy.updateRenderMode( null ); } diff --git a/src/main/java/appeng/core/sync/packets/PacketPartialItem.java b/src/main/java/appeng/core/sync/packets/PacketPartialItem.java index d5d6a42c..cb97a431 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPartialItem.java +++ b/src/main/java/appeng/core/sync/packets/PacketPartialItem.java @@ -32,8 +32,8 @@ import appeng.core.sync.network.INetworkInfo; public class PacketPartialItem extends AppEngPacket { - final short pageNum; - final byte[] data; + private final short pageNum; + private final byte[] data; // automatic. public PacketPartialItem( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java index 40450c8b..09234fcf 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java @@ -59,7 +59,7 @@ public class PacketPatternSlot extends AppEngPacket } } - public IAEItemStack readItem( final ByteBuf stream ) throws IOException + private IAEItemStack readItem( final ByteBuf stream ) throws IOException { final boolean hasItem = stream.readBoolean(); diff --git a/src/main/java/appeng/core/sync/packets/PacketProgressBar.java b/src/main/java/appeng/core/sync/packets/PacketProgressBar.java index c12af158..11f85a2b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketProgressBar.java +++ b/src/main/java/appeng/core/sync/packets/PacketProgressBar.java @@ -33,8 +33,8 @@ import appeng.core.sync.network.INetworkInfo; public class PacketProgressBar extends AppEngPacket { - final short id; - final long value; + private final short id; + private final long value; // automatic. public PacketProgressBar( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java b/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java index a5d723c1..f84f3e56 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java +++ b/src/main/java/appeng/core/sync/packets/PacketSwapSlots.java @@ -32,8 +32,8 @@ import appeng.core.sync.network.INetworkInfo; public class PacketSwapSlots extends AppEngPacket { - final int slotA; - final int slotB; + private final int slotA; + private final int slotB; // automatic. public PacketSwapSlots( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java index 1c887a79..851fb259 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java +++ b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java @@ -38,7 +38,7 @@ import appeng.util.Platform; public class PacketSwitchGuis extends AppEngPacket { - final GuiBridge newGui; + private final GuiBridge newGui; // automatic. public PacketSwitchGuis( final ByteBuf stream ) @@ -53,7 +53,7 @@ public class PacketSwitchGuis extends AppEngPacket if( Platform.isClient() ) { - AEBaseGui.switchingGuis = true; + AEBaseGui.setSwitchingGuis( true ); } final ByteBuf data = Unpooled.buffer(); @@ -71,11 +71,11 @@ public class PacketSwitchGuis extends AppEngPacket if( c instanceof AEBaseContainer ) { final AEBaseContainer bc = (AEBaseContainer) c; - final ContainerOpenContext context = bc.openContext; + final ContainerOpenContext context = bc.getOpenContext(); if( context != null ) { final TileEntity te = context.getTile(); - Platform.openGUI( player, te, context.side, this.newGui ); + Platform.openGUI( player, te, context.getSide(), this.newGui ); } } } @@ -83,6 +83,6 @@ public class PacketSwitchGuis extends AppEngPacket @Override public void clientPacketData( final INetworkInfo network, final AppEngPacket packet, final EntityPlayer player ) { - AEBaseGui.switchingGuis = true; + AEBaseGui.setSwitchingGuis( true ); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java index 2e8c9354..975dad9b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java @@ -45,11 +45,11 @@ import appeng.util.Platform; public class PacketTransitionEffect extends AppEngPacket { - public final boolean mode; - final double x; - final double y; - final double z; - final ForgeDirection d; + private final boolean mode; + private final double x; + private final double y; + private final double z; + private final ForgeDirection d; // automatic. public PacketTransitionEffect( final ByteBuf stream ) diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 762aeb73..07cfcbf3 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -148,7 +148,7 @@ public class PacketValueConfig extends AppEngPacket final ContainerPatternTerm cpt = (ContainerPatternTerm) c; if( this.Name.equals( "PatternTerminal.CraftMode" ) ) { - cpt.ct.setCraftingRecipe( this.Value.equals( "1" ) ); + cpt.getPatternTerminal().setCraftingRecipe( this.Value.equals( "1" ) ); } else if( this.Name.equals( "PatternTerminal.Encode" ) ) { @@ -160,7 +160,7 @@ public class PacketValueConfig extends AppEngPacket } else if( this.Name.equals( "PatternTerminal.Substitute" ) ) { - cpt.ct.setSubstitution( this.Value.equals( "1" ) ); + cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) ); } } else if( this.Name.startsWith( "StorageBus." ) && c instanceof ContainerStorageBus ) @@ -185,7 +185,7 @@ public class PacketValueConfig extends AppEngPacket { if( this.Value.equals( "CopyMode" ) ) { - ccw.nextCopyMode(); + ccw.nextWorkBenchCopyMode(); } else if( this.Value.equals( "Partition" ) ) { @@ -240,7 +240,7 @@ public class PacketValueConfig extends AppEngPacket if( this.Name.equals( "CustomName" ) && c instanceof AEBaseContainer ) { - ( (AEBaseContainer) c ).customName = this.Value; + ( (AEBaseContainer) c ).setCustomName( this.Value ); } else if( this.Name.startsWith( "SyncDat." ) ) { diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index e13be38c..87867af1 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -80,12 +80,12 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn final String id = String.valueOf( storageID ); final String data = this.config.get( "gridstorage", id, "" ).getString(); final GridStorage thisStorage = new GridStorage( data, storageID, gss ); - gss.gridStorage = new WeakReference( thisStorage ); + gss.setGridStorage( new WeakReference( thisStorage ) ); this.loadedStorage.put( gss, new WeakReference( gss ) ); return thisStorage; } - return result.get().gridStorage.get(); + return result.get().getGridStorage().get(); } /** @@ -98,7 +98,7 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn final long storageID = this.nextGridStorage(); final GridStorageSearch gss = new GridStorageSearch( storageID ); final GridStorage newStorage = new GridStorage( storageID, gss ); - gss.gridStorage = new WeakReference( newStorage ); + gss.setGridStorage( new WeakReference( newStorage ) ); this.loadedStorage.put( gss, new WeakReference( gss ) ); return newStorage; @@ -152,7 +152,7 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn // populate new data for( final GridStorageSearch gs : this.loadedStorage.keySet() ) { - final GridStorage thisStorage = gs.gridStorage.get(); + final GridStorage thisStorage = gs.getGridStorage().get(); if( thisStorage != null && thisStorage.getGrid() != null && !thisStorage.getGrid().isEmpty() ) { final String value = thisStorage.getValue(); diff --git a/src/main/java/appeng/crafting/CraftBranchFailure.java b/src/main/java/appeng/crafting/CraftBranchFailure.java index c8da305e..c0491678 100644 --- a/src/main/java/appeng/crafting/CraftBranchFailure.java +++ b/src/main/java/appeng/crafting/CraftBranchFailure.java @@ -27,7 +27,7 @@ public class CraftBranchFailure extends Exception private static final long serialVersionUID = 654603652836724823L; - final IAEItemStack missing; + private final IAEItemStack missing; public CraftBranchFailure( final IAEItemStack what, final long howMany ) { diff --git a/src/main/java/appeng/crafting/CraftingCalculationFailure.java b/src/main/java/appeng/crafting/CraftingCalculationFailure.java index d34ff80f..bfaa7ece 100644 --- a/src/main/java/appeng/crafting/CraftingCalculationFailure.java +++ b/src/main/java/appeng/crafting/CraftingCalculationFailure.java @@ -27,7 +27,7 @@ public class CraftingCalculationFailure extends RuntimeException private static final long serialVersionUID = 654603652836724823L; - final IAEItemStack missing; + private final IAEItemStack missing; public CraftingCalculationFailure( final IAEItemStack what, final long howMany ) { diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 838b09cd..e8ca4ffb 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -20,8 +20,6 @@ package appeng.crafting; import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; @@ -47,36 +45,25 @@ import appeng.hooks.TickHandler; public class CraftingJob implements Runnable, ICraftingJob { - final IItemList storage; - final Set prophecies; - final MECraftingInventory original; - final World world; - final IItemList crafting = AEApi.instance().storage().createItemList(); - final IItemList missing = AEApi.instance().storage().createItemList(); - final HashMap opsAndMultiplier = new HashMap(); + private final MECraftingInventory original; + private final World world; + private final IItemList crafting = AEApi.instance().storage().createItemList(); + private final IItemList missing = AEApi.instance().storage().createItemList(); + private final HashMap opsAndMultiplier = new HashMap(); private final Object monitor = new Object(); private final Stopwatch watch = Stopwatch.createUnstarted(); - public CraftingTreeNode tree; - IAEItemStack output; - boolean simulate = false; - MECraftingInventory availableCheck; - long bytes = 0; - private BaseActionSource actionSrc; - private ICraftingCallback callback; + private CraftingTreeNode tree; + private final IAEItemStack output; + private boolean simulate = false; + private MECraftingInventory availableCheck; + private long bytes = 0; + private final BaseActionSource actionSrc; + private final ICraftingCallback callback; private boolean running = false; private boolean done = false; private int time = 5; private int incTime = Integer.MAX_VALUE; - public CraftingJob( final World w, final NBTTagCompound data ) - { - this.world = this.wrapWorld( w ); - this.storage = AEApi.instance().storage().createItemList(); - this.prophecies = new HashSet(); - this.original = null; - this.availableCheck = null; - } - private World wrapWorld( final World w ) { return w; @@ -86,8 +73,6 @@ public class CraftingJob implements Runnable, ICraftingJob { this.world = this.wrapWorld( w ); this.output = what.copy(); - this.storage = AEApi.instance().storage().createItemList(); - this.prophecies = new HashSet(); this.actionSrc = actionSrc; this.callback = callback; @@ -95,7 +80,7 @@ public class CraftingJob implements Runnable, ICraftingJob final IStorageGrid sg = grid.getCache( IStorageGrid.class ); this.original = new MECraftingInventory( sg.getItemInventory(), actionSrc, false, false, false ); - this.tree = this.getCraftingTree( cc, what ); + this.setTree( this.getCraftingTree( cc, what ) ); this.availableCheck = null; } @@ -104,12 +89,12 @@ public class CraftingJob implements Runnable, ICraftingJob return new CraftingTreeNode( cc, this, what, null, -1, 0 ); } - public void refund( final IAEItemStack o ) + void refund( final IAEItemStack o ) { this.availableCheck.injectItems( o, Actionable.MODULATE, this.actionSrc ); } - public IAEItemStack checkUse( final IAEItemStack available ) + IAEItemStack checkUse( final IAEItemStack available ) { return this.availableCheck.extractItems( available, Actionable.MODULATE, this.actionSrc ); } @@ -119,7 +104,7 @@ public class CraftingJob implements Runnable, ICraftingJob } - public void addTask( IAEItemStack what, final long crafts, final ICraftingPatternDetails details, final int depth ) + void addTask( IAEItemStack what, final long crafts, final ICraftingPatternDetails details, final int depth ) { if( crafts > 0 ) { @@ -129,7 +114,7 @@ public class CraftingJob implements Runnable, ICraftingJob } } - public void addMissing( IAEItemStack what ) + void addMissing( IAEItemStack what ) { what = what.copy(); this.missing.add( what ); @@ -151,8 +136,8 @@ public class CraftingJob implements Runnable, ICraftingJob craftingInventory.ignore( this.output ); this.availableCheck = new MECraftingInventory( this.original, false, false, false ); - this.tree.request( craftingInventory, this.output.getStackSize(), this.actionSrc ); - this.tree.dive( this ); + this.getTree().request( craftingInventory, this.output.getStackSize(), this.actionSrc ); + this.getTree().dive( this ); for( final String s : this.opsAndMultiplier.keySet() ) { @@ -176,9 +161,9 @@ public class CraftingJob implements Runnable, ICraftingJob this.availableCheck = new MECraftingInventory( this.original, false, false, false ); - this.tree.setSimulate(); - this.tree.request( craftingInventory, this.output.getStackSize(), this.actionSrc ); - this.tree.dive( this ); + this.getTree().setSimulate(); + this.getTree().request( craftingInventory, this.output.getStackSize(), this.actionSrc ); + this.getTree().dive( this ); for( final String s : this.opsAndMultiplier.keySet() ) { @@ -225,7 +210,7 @@ public class CraftingJob implements Runnable, ICraftingJob this.finish(); } - public void handlePausing() throws InterruptedException + void handlePausing() throws InterruptedException { if( this.incTime > 100 ) { @@ -261,7 +246,7 @@ public class CraftingJob implements Runnable, ICraftingJob this.incTime++; } - public void finish() + private void finish() { if( this.callback != null ) { @@ -298,9 +283,9 @@ public class CraftingJob implements Runnable, ICraftingJob @Override public void populatePlan( final IItemList plan ) { - if( this.tree != null ) + if( this.getTree() != null ) { - this.tree.getPlan( plan ); + this.getTree().getPlan( plan ); } } @@ -315,7 +300,7 @@ public class CraftingJob implements Runnable, ICraftingJob return this.done; } - public World getWorld() + World getWorld() { return this.world; } @@ -363,15 +348,25 @@ public class CraftingJob implements Runnable, ICraftingJob return true; } - public void addBytes( final long crafts ) + void addBytes( final long crafts ) { this.bytes += crafts; } - static class TwoIntegers + public CraftingTreeNode getTree() + { + return this.tree; + } + + private void setTree( final CraftingTreeNode tree ) + { + this.tree = tree; + } + + private static class TwoIntegers { - public final long perOp = 0; - public final long times = 0; + private final long perOp = 0; + private final long times = 0; } } diff --git a/src/main/java/appeng/crafting/CraftingLink.java b/src/main/java/appeng/crafting/CraftingLink.java index 07dd177d..56fb5d50 100644 --- a/src/main/java/appeng/crafting/CraftingLink.java +++ b/src/main/java/appeng/crafting/CraftingLink.java @@ -31,19 +31,19 @@ import appeng.api.storage.data.IAEItemStack; public class CraftingLink implements ICraftingLink { - final ICraftingRequester req; - final ICraftingCPU cpu; - final String CraftID; - final boolean standalone; - boolean canceled = false; - boolean done = false; - CraftingLinkNexus tie; + private final ICraftingRequester req; + private final ICraftingCPU cpu; + private final String CraftID; + private final boolean standalone; + private boolean canceled = false; + private boolean done = false; + private CraftingLinkNexus tie; public CraftingLink( final NBTTagCompound data, final ICraftingRequester req ) { this.CraftID = data.getString( "CraftID" ); - this.canceled = data.getBoolean( "canceled" ); - this.done = data.getBoolean( "done" ); + this.setCanceled( data.getBoolean( "canceled" ) ); + this.setDone( data.getBoolean( "done" ) ); this.standalone = data.getBoolean( "standalone" ); if( !data.hasKey( "req" ) || !data.getBoolean( "req" ) ) @@ -58,8 +58,8 @@ public class CraftingLink implements ICraftingLink public CraftingLink( final NBTTagCompound data, final ICraftingCPU cpu ) { this.CraftID = data.getString( "CraftID" ); - this.canceled = data.getBoolean( "canceled" ); - this.done = data.getBoolean( "done" ); + this.setCanceled( data.getBoolean( "canceled" ) ); + this.setDone( data.getBoolean( "done" ) ); this.standalone = data.getBoolean( "standalone" ); if( !data.hasKey( "req" ) || data.getBoolean( "req" ) ) @@ -121,7 +121,7 @@ public class CraftingLink implements ICraftingLink return; } - this.canceled = true; + this.setCanceled( true ); if( this.tie != null ) { @@ -141,10 +141,10 @@ public class CraftingLink implements ICraftingLink public void writeToNBT( final NBTTagCompound tag ) { tag.setString( "CraftID", this.CraftID ); - tag.setBoolean( "canceled", this.canceled ); - tag.setBoolean( "done", this.done ); + tag.setBoolean( "canceled", this.isCanceled() ); + tag.setBoolean( "done", this.isDone() ); tag.setBoolean( "standalone", this.standalone ); - tag.setBoolean( "req", this.req != null ); + tag.setBoolean( "req", this.getRequester() != null ); } @Override @@ -160,7 +160,7 @@ public class CraftingLink implements ICraftingLink this.tie.remove( this ); } - if( this.canceled && n != null ) + if( this.isCanceled() && n != null ) { n.cancel(); this.tie = null; @@ -177,12 +177,12 @@ public class CraftingLink implements ICraftingLink public IAEItemStack injectItems( final IAEItemStack input, final Actionable mode ) { - if( this.tie == null || this.tie.req == null || this.tie.req.req == null ) + if( this.tie == null || this.tie.getRequest() == null || this.tie.getRequest().getRequester() == null ) { return input; } - return this.tie.req.req.injectCraftedItems( this.tie.req, input, mode ); + return this.tie.getRequest().getRequester().injectCraftedItems( this.tie.getRequest(), input, mode ); } public void markDone() @@ -192,4 +192,24 @@ public class CraftingLink implements ICraftingLink this.tie.markDone(); } } + + void setCanceled( final boolean canceled ) + { + this.canceled = canceled; + } + + ICraftingRequester getRequester() + { + return this.req; + } + + ICraftingCPU getCpu() + { + return this.cpu; + } + + void setDone( final boolean done ) + { + this.done = done; + } } diff --git a/src/main/java/appeng/crafting/CraftingLinkNexus.java b/src/main/java/appeng/crafting/CraftingLinkNexus.java index a01a23dd..7a30dcf6 100644 --- a/src/main/java/appeng/crafting/CraftingLinkNexus.java +++ b/src/main/java/appeng/crafting/CraftingLinkNexus.java @@ -27,16 +27,16 @@ import appeng.me.cache.CraftingGridCache; public class CraftingLinkNexus { - public final String CraftID; - boolean canceled = false; - boolean done = false; - int tickOfDeath = 0; - CraftingLink req; - CraftingLink cpu; + private final String craftID; + private boolean canceled = false; + private boolean done = false; + private int tickOfDeath = 0; + private CraftingLink req; + private CraftingLink cpu; public CraftingLinkNexus( final String craftID ) { - this.CraftID = craftID; + this.craftID = craftID; } public boolean isDead( final IGrid g, final CraftingGridCache craftingGridCache ) @@ -46,14 +46,14 @@ public class CraftingLinkNexus return true; } - if( this.req == null || this.cpu == null ) + if( this.getRequest() == null || this.cpu == null ) { this.tickOfDeath++; } else { - final boolean hasCpu = craftingGridCache.hasCpu( this.cpu.cpu ); - final boolean hasMachine = this.req.req.getActionableNode().getGrid() == g; + final boolean hasCpu = craftingGridCache.hasCpu( this.cpu.getCpu() ); + final boolean hasMachine = this.getRequest().getRequester().getActionableNode().getGrid() == g; if( hasCpu && hasMachine ) { @@ -74,30 +74,30 @@ public class CraftingLinkNexus return false; } - public void cancel() + void cancel() { this.canceled = true; - if( this.req != null ) + if( this.getRequest() != null ) { - this.req.canceled = true; - if( this.req.req != null ) + this.getRequest().setCanceled( true ); + if( this.getRequest().getRequester() != null ) { - this.req.req.jobStateChange( this.req ); + this.getRequest().getRequester().jobStateChange( this.getRequest() ); } } if( this.cpu != null ) { - this.cpu.canceled = true; + this.cpu.setCanceled( true ); } } - public void remove( final CraftingLink craftingLink ) + void remove( final CraftingLink craftingLink ) { - if( this.req == craftingLink ) + if( this.getRequest() == craftingLink ) { - this.req = null; + this.setRequest( null ); } else if( this.cpu == craftingLink ) { @@ -105,60 +105,70 @@ public class CraftingLinkNexus } } - public void add( final CraftingLink craftingLink ) + void add( final CraftingLink craftingLink ) { - if( craftingLink.cpu != null ) + if( craftingLink.getCpu() != null ) { this.cpu = craftingLink; } - else if( craftingLink.req != null ) + else if( craftingLink.getRequester() != null ) { - this.req = craftingLink; + this.setRequest( craftingLink ); } } - public boolean isCanceled() + boolean isCanceled() { return this.canceled; } - public boolean isDone() + boolean isDone() { return this.done; } - public void markDone() + void markDone() { this.done = true; - if( this.req != null ) + if( this.getRequest() != null ) { - this.req.done = true; - if( this.req.req != null ) + this.getRequest().setDone( true ); + if( this.getRequest().getRequester() != null ) { - this.req.req.jobStateChange( this.req ); + this.getRequest().getRequester().jobStateChange( this.getRequest() ); } } if( this.cpu != null ) { - this.cpu.done = true; + this.cpu.setDone( true ); } } public boolean isMachine( final IGridHost machine ) { - return this.req == machine; + return this.getRequest() == machine; } public void removeNode() { - if( this.req != null ) + if( this.getRequest() != null ) { - this.req.setNexus( null ); + this.getRequest().setNexus( null ); } - this.req = null; + this.setRequest( null ); this.tickOfDeath = 0; } + + public CraftingLink getRequest() + { + return req; + } + + public void setRequest( CraftingLink req ) + { + this.req = req; + } } diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 06672d16..55e07381 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -43,7 +43,7 @@ public class CraftingTreeNode { // what slot! - final int slot; + private final int slot; private final CraftingJob job; private final IItemList used = AEApi.instance().storage().createItemList(); // parent node. @@ -55,10 +55,10 @@ public class CraftingTreeNode private final ArrayList nodes = new ArrayList(); private int bytes = 0; private boolean canEmit = false; - private boolean cannotUse = false; private long missing = 0; private long howManyEmitted = 0; private boolean exhausted = false; + private boolean sim; public CraftingTreeNode( final ICraftingGrid cc, final CraftingJob job, final IAEItemStack wat, final CraftingTreeProcess par, final int slot, final int depth ) @@ -117,14 +117,14 @@ public class CraftingTreeNode return this.parent.notRecursive( details ); } - public IAEItemStack request( final MECraftingInventory inv, long l, final BaseActionSource src ) throws CraftBranchFailure, InterruptedException + IAEItemStack request( final MECraftingInventory inv, long l, final BaseActionSource src ) throws CraftBranchFailure, InterruptedException { this.job.handlePausing(); final List thingsUsed = new LinkedList(); this.what.setStackSize( l ); - if( this.slot >= 0 && this.parent != null && this.parent.details.isCraftable() ) + if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() ) { final Collection itemList; final IItemList inventoryList = inv.getItemList(); @@ -147,7 +147,7 @@ public class CraftingTreeNode for( IAEItemStack fuzz : itemList ) { - if( this.parent.details.isValidItemForSlot( this.slot, fuzz.getItemStack(), this.world ) ) + if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.getItemStack(), this.world ) ) { fuzz = fuzz.copy(); fuzz.setStackSize( l ); @@ -309,7 +309,7 @@ public class CraftingTreeNode throw new CraftBranchFailure( this.what, l ); } - public void dive( final CraftingJob job ) + void dive( final CraftingJob job ) { if( this.missing > 0 ) { @@ -325,14 +325,14 @@ public class CraftingTreeNode } } - public IAEItemStack getStack( final long size ) + IAEItemStack getStack( final long size ) { final IAEItemStack is = this.what.copy(); is.setStackSize( size ); return is; } - public void setSimulate() + void setSimulate() { this.sim = true; this.missing = 0; @@ -373,7 +373,7 @@ public class CraftingTreeNode } } - public void getPlan( final IItemList plan ) + void getPlan( final IItemList plan ) { if( this.missing > 0 ) { @@ -399,4 +399,9 @@ public class CraftingTreeNode pro.getPlan( plan ); } } + + int getSlot() + { + return this.slot; + } } diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index fbdc72bb..f101edcd 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -45,17 +45,17 @@ import appeng.util.Platform; public class CraftingTreeProcess { - final CraftingTreeNode parent; + private final CraftingTreeNode parent; final ICraftingPatternDetails details; - final CraftingJob job; - final Map nodes = new HashMap(); + private final CraftingJob job; + private final Map nodes = new HashMap(); private final int depth; - public boolean possible = true; - World world; - long crafts = 0; - boolean containerItems; - boolean limitQty; - boolean fullSimulation; + boolean possible = true; + private World world; + private long crafts = 0; + private boolean containerItems; + private boolean limitQty; + private boolean fullSimulation; private long bytes = 0; public CraftingTreeProcess( final ICraftingGrid cc, final CraftingJob job, final ICraftingPatternDetails details, final CraftingTreeNode craftingTreeNode, final int depth ) @@ -171,7 +171,7 @@ public class CraftingTreeProcess } } - public boolean notRecursive( final ICraftingPatternDetails details ) + boolean notRecursive( final ICraftingPatternDetails details ) { return this.parent == null || this.parent.notRecursive( details ); } @@ -185,7 +185,7 @@ public class CraftingTreeProcess return ( remaining / stackSize ) + ( remaining % stackSize != 0 ? 1 : 0 ); } - public void request( final MECraftingInventory inv, final long i, final BaseActionSource src ) throws CraftBranchFailure, InterruptedException + void request( final MECraftingInventory inv, final long i, final BaseActionSource src ) throws CraftBranchFailure, InterruptedException { this.job.handlePausing(); @@ -198,7 +198,7 @@ public class CraftingTreeProcess final IAEItemStack item = entry.getKey().getStack( entry.getValue() ); final IAEItemStack stack = entry.getKey().request( inv, item.getStackSize(), src ); - ic.setInventorySlotContents( entry.getKey().slot, stack.getItemStack() ); + ic.setInventorySlotContents( entry.getKey().getSlot(), stack.getItemStack() ); } FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.world ), this.details.getOutput( ic, this.world ), ic ); @@ -250,7 +250,7 @@ public class CraftingTreeProcess this.crafts += i; } - public void dive( final CraftingJob job ) + void dive( final CraftingJob job ) { job.addTask( this.getAmountCrafted( this.parent.getStack( 1 ) ), this.crafts, this.details, this.depth ); for( final CraftingTreeNode pro : this.nodes.keySet() ) @@ -287,7 +287,7 @@ public class CraftingTreeProcess throw new IllegalStateException( "Crafting Tree construction failed." ); } - public void setSimulate() + void setSimulate() { this.crafts = 0; this.bytes = 0; @@ -298,7 +298,7 @@ public class CraftingTreeProcess } } - public void setJob( final MECraftingInventory storage, final CraftingCPUCluster craftingCPUCluster, final BaseActionSource src ) throws CraftBranchFailure + void setJob( final MECraftingInventory storage, final CraftingCPUCluster craftingCPUCluster, final BaseActionSource src ) throws CraftBranchFailure { craftingCPUCluster.addCrafting( this.details, this.crafts ); @@ -308,7 +308,7 @@ public class CraftingTreeProcess } } - public void getPlan( final IItemList plan ) + void getPlan( final IItemList plan ) { for( IAEItemStack i : this.details.getOutputs() ) { diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 2ee6a41a..293f61af 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -37,9 +37,9 @@ import appeng.me.cache.CraftingGridCache; public class CraftingWatcher implements ICraftingWatcher { - final CraftingGridCache gsc; - final ICraftingWatcherHost host; - final HashSet myInterests = new HashSet(); + private final CraftingGridCache gsc; + private final ICraftingWatcherHost host; + private final HashSet myInterests = new HashSet(); public CraftingWatcher( final CraftingGridCache cache, final ICraftingWatcherHost host ) { @@ -99,13 +99,13 @@ public class CraftingWatcher implements ICraftingWatcher return false; } - return this.myInterests.add( e.copy() ) && this.gsc.interestManager.put( e, this ); + return this.myInterests.add( e.copy() ) && this.gsc.getInterestManager().put( e, this ); } @Override public boolean remove( final Object o ) { - return this.myInterests.remove( o ) && this.gsc.interestManager.remove( (IAEStack) o, this ); + return this.myInterests.remove( o ) && this.gsc.getInterestManager().remove( (IAEStack) o, this ); } @Override @@ -162,17 +162,17 @@ public class CraftingWatcher implements ICraftingWatcher final Iterator i = this.myInterests.iterator(); while( i.hasNext() ) { - this.gsc.interestManager.remove( i.next(), this ); + this.gsc.getInterestManager().remove( i.next(), this ); i.remove(); } } - class ItemWatcherIterator implements Iterator + private class ItemWatcherIterator implements Iterator { - final CraftingWatcher watcher; - final Iterator interestIterator; - IAEStack myLast; + private final CraftingWatcher watcher; + private final Iterator interestIterator; + private IAEStack myLast; public ItemWatcherIterator( final CraftingWatcher parent, final Iterator i ) { @@ -195,7 +195,7 @@ public class CraftingWatcher implements ICraftingWatcher @Override public void remove() { - CraftingWatcher.this.gsc.interestManager.remove( this.myLast, this.watcher ); + CraftingWatcher.this.gsc.getInterestManager().remove( this.myLast, this.watcher ); this.interestIterator.remove(); } } diff --git a/src/main/java/appeng/crafting/MECraftingInventory.java b/src/main/java/appeng/crafting/MECraftingInventory.java index 0ec5f990..433e5dc7 100644 --- a/src/main/java/appeng/crafting/MECraftingInventory.java +++ b/src/main/java/appeng/crafting/MECraftingInventory.java @@ -32,19 +32,19 @@ import appeng.api.storage.data.IItemList; public class MECraftingInventory implements IMEInventory { - final MECraftingInventory par; + private final MECraftingInventory par; - final IMEInventory target; - final IItemList localCache; + private final IMEInventory target; + private final IItemList localCache; - final boolean logExtracted; - final IItemList extractedCache; + private final boolean logExtracted; + private final IItemList extractedCache; - final boolean logInjections; - final IItemList injectedCache; + private final boolean logInjections; + private final IItemList injectedCache; - final boolean logMissing; - final IItemList missingCache; + private final boolean logMissing; + private final IItemList missingCache; public MECraftingInventory() { @@ -336,12 +336,12 @@ public class MECraftingInventory implements IMEInventory return true; } - public void addMissing( final IAEItemStack extra ) + private void addMissing( final IAEItemStack extra ) { this.missingCache.add( extra ); } - public void ignore( final IAEItemStack what ) + void ignore( final IAEItemStack what ) { final IAEItemStack list = this.localCache.findPrecise( what ); if( list != null ) diff --git a/src/main/java/appeng/debug/TileChunkLoader.java b/src/main/java/appeng/debug/TileChunkLoader.java index 403a9fcb..eaaeabde 100644 --- a/src/main/java/appeng/debug/TileChunkLoader.java +++ b/src/main/java/appeng/debug/TileChunkLoader.java @@ -42,8 +42,8 @@ import appeng.util.Platform; public class TileChunkLoader extends AEBaseTile { - boolean requestTicket = true; - Ticket ct; + private boolean requestTicket = true; + private Ticket ct = null; @TileEvent( TileEventType.TICK ) public void onTickEvent() @@ -55,7 +55,7 @@ public class TileChunkLoader extends AEBaseTile } } - void initTicket() + private void initTicket() { if( Platform.isClient() ) { diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index f817643e..f2916853 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -35,10 +35,10 @@ import appeng.util.Platform; public class TileCubeGenerator extends AEBaseTile { - int size = 3; - ItemStack is = null; - int countdown = 20 * 10; - EntityPlayer who; + private int size = 3; + private ItemStack is = null; + private int countdown = 20 * 10; + private EntityPlayer who = null; @TileEvent( TileEventType.TICK ) public void onTickEvent() @@ -62,7 +62,7 @@ public class TileCubeGenerator extends AEBaseTile } } - void spawn() + private void spawn() { this.worldObj.setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK, 0, 3 ); @@ -83,7 +83,7 @@ public class TileCubeGenerator extends AEBaseTile } } - public void click( final EntityPlayer player ) + void click( final EntityPlayer player ) { if( Platform.isServer() ) { diff --git a/src/main/java/appeng/debug/TilePhantomNode.java b/src/main/java/appeng/debug/TilePhantomNode.java index 1fbcd3f3..7b6c3ebb 100644 --- a/src/main/java/appeng/debug/TilePhantomNode.java +++ b/src/main/java/appeng/debug/TilePhantomNode.java @@ -31,8 +31,8 @@ import appeng.tile.grid.AENetworkTile; public class TilePhantomNode extends AENetworkTile { - protected AENetworkProxy proxy = null; - boolean crashMode = false; + private AENetworkProxy proxy = null; + private boolean crashMode = false; @Override public IGridNode getGridNode( final ForgeDirection dir ) @@ -54,7 +54,7 @@ public class TilePhantomNode extends AENetworkTile this.crashMode = true; } - public void triggerCrashMode() + void triggerCrashMode() { if( this.proxy != null ) { diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 5667cb67..0fe5af39 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -137,7 +137,7 @@ public class ToolDebugCard extends AEBaseItem if( center.getMachine() instanceof PartP2PTunnel ) { - this.outputMsg( player, "Freq: " + ( (PartP2PTunnel) center.getMachine() ).freq ); + this.outputMsg( player, "Freq: " + ( (PartP2PTunnel) center.getMachine() ).getFrequency() ); } final TickManagerCache tmc = g.getCache( ITickManager.class ); @@ -214,7 +214,7 @@ public class ToolDebugCard extends AEBaseItem player.addChatMessage( new ChatComponentText( string ) ); } - public String timeMeasurement( final long nanos ) + private String timeMeasurement( final long nanos ) { final long ms = nanos / 100000; if( nanos <= 100000 ) diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 6133a683..ee0d3941 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -41,7 +41,7 @@ import appeng.util.Platform; public class ToolEraser extends AEBaseItem { - public static final int BLOCK_ERASE_LIMIT = 90000; + private static final int BLOCK_ERASE_LIMIT = 90000; public ToolEraser() { diff --git a/src/main/java/appeng/entity/AEBaseEntityItem.java b/src/main/java/appeng/entity/AEBaseEntityItem.java index 07e4c11c..a17dcdfc 100644 --- a/src/main/java/appeng/entity/AEBaseEntityItem.java +++ b/src/main/java/appeng/entity/AEBaseEntityItem.java @@ -41,7 +41,7 @@ public abstract class AEBaseEntityItem extends EntityItem } @SuppressWarnings( "unchecked" ) - public List getCheckedEntitiesWithinAABBExcludingEntity( final AxisAlignedBB region ) + protected List getCheckedEntitiesWithinAABBExcludingEntity( final AxisAlignedBB region ) { return this.worldObj.getEntitiesWithinAABBExcludingEntity( this, region ); } diff --git a/src/main/java/appeng/entity/EntityChargedQuartz.java b/src/main/java/appeng/entity/EntityChargedQuartz.java index 0bdd1647..28e4c24a 100644 --- a/src/main/java/appeng/entity/EntityChargedQuartz.java +++ b/src/main/java/appeng/entity/EntityChargedQuartz.java @@ -43,8 +43,8 @@ import appeng.util.Platform; public final class EntityChargedQuartz extends AEBaseEntityItem { - int delay = 0; - int transformTime = 0; + private int delay = 0; + private int transformTime = 0; @Reflected public EntityChargedQuartz( final World w ) @@ -96,7 +96,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem } } - public boolean transform() + private boolean transform() { final ItemStack item = this.getEntityItem(); final IMaterials materials = AEApi.instance().definitions().materials(); diff --git a/src/main/java/appeng/entity/EntityFloatingItem.java b/src/main/java/appeng/entity/EntityFloatingItem.java index ff6c3cce..57e930ad 100644 --- a/src/main/java/appeng/entity/EntityFloatingItem.java +++ b/src/main/java/appeng/entity/EntityFloatingItem.java @@ -30,8 +30,8 @@ public final class EntityFloatingItem extends EntityItem public static int ageStatic = 0; private final Entity parent; - int superDeath = 0; - float progress = 0; + private int superDeath = 0; + private float progress = 0; public EntityFloatingItem( final Entity parent, final World world, final double x, final double y, final double z, final ItemStack stack ) { @@ -69,4 +69,9 @@ public final class EntityFloatingItem extends EntityItem this.setDead(); } } + + float getProgress() + { + return this.progress; + } } diff --git a/src/main/java/appeng/entity/EntityIds.java b/src/main/java/appeng/entity/EntityIds.java index 3c469421..a79ac012 100644 --- a/src/main/java/appeng/entity/EntityIds.java +++ b/src/main/java/appeng/entity/EntityIds.java @@ -24,10 +24,10 @@ import net.minecraft.entity.Entity; public final class EntityIds { - public static final int TINY_TNT = 10; - public static final int SINGULARITY = 11; - public static final int CHARGED_QUARTZ = 12; - public static final int GROWING_CRYSTAL = 13; + private static final int TINY_TNT = 10; + private static final int SINGULARITY = 11; + private static final int CHARGED_QUARTZ = 12; + private static final int GROWING_CRYSTAL = 13; private EntityIds() { diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 230da9c0..2aa51ce2 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -67,7 +67,7 @@ public final class EntitySingularity extends AEBaseEntityItem return super.attackEntityFrom( src, dmg ); } - public void doExplosion() + private void doExplosion() { if( Platform.isClient() ) { diff --git a/src/main/java/appeng/entity/RenderFloatingItem.java b/src/main/java/appeng/entity/RenderFloatingItem.java index d46df9ca..1ae14c4f 100644 --- a/src/main/java/appeng/entity/RenderFloatingItem.java +++ b/src/main/java/appeng/entity/RenderFloatingItem.java @@ -19,9 +19,6 @@ package appeng.entity; -import java.nio.ByteBuffer; -import java.nio.DoubleBuffer; - import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.entity.RenderItem; @@ -37,8 +34,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderFloatingItem extends RenderItem { - public static DoubleBuffer buffer = ByteBuffer.allocateDirect( 8 * 4 ).asDoubleBuffer(); - public RenderFloatingItem() { this.shadowOpaque = 0.0F; @@ -51,7 +46,7 @@ public class RenderFloatingItem extends RenderItem if( entityItem instanceof EntityFloatingItem ) { final EntityFloatingItem efi = (EntityFloatingItem) entityItem; - if( efi.progress > 0.0 ) + if( efi.getProgress() > 0.0 ) { GL11.glPushMatrix(); diff --git a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java index 31e7969f..21b7fd08 100644 --- a/src/main/java/appeng/entity/RenderTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/RenderTinyTNTPrimed.java @@ -51,7 +51,7 @@ public class RenderTinyTNTPrimed extends Render this.renderPrimedTNT( (EntityTinyTNTPrimed) tnt, x, y, z, life ); } - public void renderPrimedTNT( final EntityTinyTNTPrimed tnt, final double x, final double y, final double z, final float life ) + private void renderPrimedTNT( final EntityTinyTNTPrimed tnt, final double x, final double y, final double z, final float life ) { GL11.glPushMatrix(); GL11.glTranslatef( (float) x, (float) y - 0.25f, (float) z ); diff --git a/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java index 682532e6..033b2efb 100644 --- a/src/main/java/appeng/facade/FacadeContainer.java +++ b/src/main/java/appeng/facade/FacadeContainer.java @@ -43,8 +43,8 @@ import appeng.parts.CableBusStorage; public class FacadeContainer implements IFacadeContainer { - final int facades = 6; - final CableBusStorage storage; + private final int facades = 6; + private final CableBusStorage storage; public FacadeContainer( final CableBusStorage cbs ) { diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 5e5965ec..b71a4a1d 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -62,12 +62,12 @@ import appeng.util.Platform; public class FacadePart implements IFacadePart, IBoxProvider { - public final ItemStack facade; - public final ForgeDirection side; - public int thickness = 2; + private final ItemStack facade; + private final ForgeDirection side; + private int thickness = 2; @SideOnly( Side.CLIENT ) - ISimplifiedBundle prevLight; + private ISimplifiedBundle prevLight; public FacadePart( final ItemStack facade, final ForgeDirection side ) { @@ -128,8 +128,8 @@ public class FacadePart implements IFacadePart, IBoxProvider { if( rbw != null ) { - rbw.isFacade = false; - rbw.calculations = true; + rbw.setFacade( false ); + rbw.setCalculations( true ); } IIcon myIcon = null; @@ -170,7 +170,7 @@ public class FacadePart implements IFacadePart, IBoxProvider { if( rbw != null ) { - rbw.opacity = 0.3f; + rbw.setOpacity( 0.3f ); } instance.renderForPass( 1 ); } @@ -198,10 +198,10 @@ public class FacadePart implements IFacadePart, IBoxProvider if( rbw != null ) { - rbw.isFacade = true; + rbw.setFacade( true ); - rbw.calculations = true; - rbw.faces = EnumSet.noneOf( ForgeDirection.class ); + rbw.setCalculations( true ); + rbw.setFaces( EnumSet.noneOf( ForgeDirection.class ) ); if( this.prevLight != null && rbw.similarLighting( blk, rbw.blockAccess, x, y, z, this.prevLight ) ) { @@ -215,8 +215,8 @@ public class FacadePart implements IFacadePart, IBoxProvider this.prevLight = rbw.getLightingCache(); } - rbw.calculations = false; - rbw.faces = this.calculateFaceOpenFaces( rbw.blockAccess, fc, x, y, z, this.side ); + rbw.setCalculations( false ); + rbw.setFaces( this.calculateFaceOpenFaces( rbw.blockAccess, fc, x, y, z, this.side ) ); ( (RenderBlocksWorkaround) renderer ).setTexture( blk.getIcon( ForgeDirection.DOWN.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), blk.getIcon( ForgeDirection.UP.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), blk.getIcon( ForgeDirection.NORTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), blk.getIcon( ForgeDirection.SOUTH.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), blk.getIcon( ForgeDirection.WEST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ), blk.getIcon( ForgeDirection.EAST.ordinal(), ib.getMetadata( randomItem.getItemDamage() ) ) ); } @@ -327,8 +327,8 @@ public class FacadePart implements IFacadePart, IBoxProvider if( rbw != null ) { - rbw.opacity = 1.0f; - rbw.faces = EnumSet.allOf( ForgeDirection.class ); + rbw.setOpacity( 1.0f ); + rbw.setFaces( EnumSet.allOf( ForgeDirection.class ) ); } instance.renderForPass( 0 ); @@ -462,7 +462,7 @@ public class FacadePart implements IFacadePart, IBoxProvider } @Nullable - ItemStack getTexture() + private ItemStack getTexture() { final Item maybeFacade = this.facade.getItem(); diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index 2ef20ea9..437c1d28 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -85,8 +85,7 @@ import appeng.util.Platform; */ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMaskedRedstonePart, AEMultiTile { - public static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal(); - + private static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal(); private static final double SHORTER = 6.0 / 16.0; private static final double LONGER = 10.0 / 16.0; private static final double MIN_DIRECTION = 0; @@ -118,13 +117,13 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask * the bits are derived from the rotation, where 4 is the center */ private static final int CONNECTION_MASK = 0x000010; - public CableBusContainer cb = new CableBusContainer( this ); - boolean canUpdate = false; + private CableBusContainer cb = new CableBusContainer( this ); + private boolean canUpdate = false; @Override public boolean recolourBlock( final ForgeDirection side, final AEColor colour, final EntityPlayer who ) { - return this.cb.recolourBlock( side, colour, who ); + return this.getCableBus().recolourBlock( side, colour, who ); } @Override @@ -132,7 +131,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask { AxisAlignedBB b = null; - for( final AxisAlignedBB bx : this.cb.getSelectedBoundingBoxesFromPool( false, true, null, true ) ) + for( final AxisAlignedBB bx : this.getCableBus().getSelectedBoundingBoxesFromPool( false, true, null, true ) ) { if( b == null ) { @@ -167,15 +166,15 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public int getLightValue() { - return this.cb.getLightValue(); + return this.getCableBus().getLightValue(); } @Override public void onWorldJoin() { this.canUpdate = true; - this.cb.updateConnections(); - this.cb.addToWorld(); + this.getCableBus().updateConnections(); + this.getCableBus().addToWorld(); } @Override @@ -190,10 +189,10 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask if( pass == 0 || ( pass == 1 && AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) ) { BusRenderHelper.INSTANCE.setPass( pass ); - BusRenderer.INSTANCE.renderer.renderAllFaces = true; - BusRenderer.INSTANCE.renderer.blockAccess = this.world(); - BusRenderer.INSTANCE.renderer.overrideBlockTexture = null; - this.cb.renderStatic( pos.x, pos.y, pos.z ); + BusRenderer.INSTANCE.getRenderer().renderAllFaces = true; + BusRenderer.INSTANCE.getRenderer().blockAccess = this.world(); + BusRenderer.INSTANCE.getRenderer().overrideBlockTexture = null; + this.getCableBus().renderStatic( pos.x, pos.y, pos.z ); return BusRenderHelper.INSTANCE.getItemsRendered() > 0; } return false; @@ -205,45 +204,45 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask if( pass == 0 || ( pass == 1 && AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) ) { BusRenderHelper.INSTANCE.setPass( pass ); - this.cb.renderDynamic( pos.x, pos.y, pos.z ); + this.getCableBus().renderDynamic( pos.x, pos.y, pos.z ); } } @Override public void onPartChanged( final TMultiPart part ) { - this.cb.updateConnections(); + this.getCableBus().updateConnections(); } @Override public void onEntityCollision( final Entity entity ) { - this.cb.onEntityCollision( entity ); + this.getCableBus().onEntityCollision( entity ); } @Override public boolean activate( final EntityPlayer player, final MovingObjectPosition hit, final ItemStack item ) { - return this.cb.activate( player, hit.hitVec.addVector( -hit.blockX, -hit.blockY, -hit.blockZ ) ); + return this.getCableBus().activate( player, hit.hitVec.addVector( -hit.blockX, -hit.blockY, -hit.blockZ ) ); } @Override public void load( final NBTTagCompound tag ) { - this.cb.readFromNBT( tag ); + this.getCableBus().readFromNBT( tag ); } @Override public void onWorldSeparate() { this.canUpdate = false; - this.cb.removeFromWorld(); + this.getCableBus().removeFromWorld(); } @Override public void save( final NBTTagCompound tag ) { - this.cb.writeToNBT( tag ); + this.getCableBus().writeToNBT( tag ); } @Override @@ -253,7 +252,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask try { - this.cb.writeToStream( stream ); + this.getCableBus().writeToStream( stream ); packet.writeInt( stream.readableBytes() ); stream.capacity( stream.readableBytes() ); packet.writeByteArray( stream.array() ); @@ -268,7 +267,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask public ItemStack pickItem( final MovingObjectPosition hit ) { final Vec3 v3 = hit.hitVec.addVector( -hit.blockX, -hit.blockY, -hit.blockZ ); - final SelectedPart sp = this.cb.selectPart( v3 ); + final SelectedPart sp = this.getCableBus().selectPart( v3 ); if( sp != null ) { if( sp.part != null ) @@ -286,13 +285,13 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public Iterable getDrops() { - return this.cb.getDrops( new ArrayList() ); + return this.getCableBus().getDrops( new ArrayList() ); } @Override public void onNeighborChanged() { - this.cb.onNeighborChanged(); + this.getCableBus().onNeighborChanged(); } @Override @@ -304,7 +303,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public void invalidateConvertedTile() { - this.cb.setHost( this ); + this.getCableBus().setHost( this ); } @Override @@ -318,7 +317,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask if( len > 0 ) { final ByteBuf byteBuffer = Unpooled.wrappedBuffer( data ); - this.cb.readFromStream( byteBuffer ); + this.getCableBus().readFromStream( byteBuffer ); } } catch( final IOException e ) @@ -330,32 +329,32 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public boolean canConnectRedstone( final int side ) { - return this.cb.canConnectRedstone( EnumSet.of( ForgeDirection.getOrientation( side ) ) ); + return this.getCableBus().canConnectRedstone( EnumSet.of( ForgeDirection.getOrientation( side ) ) ); } @Override public int weakPowerLevel( final int side ) { - return this.cb.isProvidingWeakPower( ForgeDirection.getOrientation( side ) ); + return this.getCableBus().isProvidingWeakPower( ForgeDirection.getOrientation( side ) ); } @Override public int strongPowerLevel( final int side ) { - return this.cb.isProvidingStrongPower( ForgeDirection.getOrientation( side ) ); + return this.getCableBus().isProvidingStrongPower( ForgeDirection.getOrientation( side ) ); } public void convertFromTile( final TileEntity blockTileEntity ) { final TileCableBus tcb = (TileCableBus) blockTileEntity; - this.cb = tcb.cb; + this.setCableBus( tcb.getCableBus() ); } @Override public Iterable getOcclusionBoxes() { final LinkedList l = new LinkedList(); - for( final AxisAlignedBB b : this.cb.getSelectedBoundingBoxesFromPool( true, DISABLE_FACADE_OCCLUSION.get() == null, null, true ) ) + for( final AxisAlignedBB b : this.getCableBus().getSelectedBoundingBoxesFromPool( true, DISABLE_FACADE_OCCLUSION.get() == null, null, true ) ) { l.add( new Cuboid6( b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ ) ); } @@ -365,19 +364,19 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public IGridNode getGridNode( final ForgeDirection dir ) { - return this.cb.getGridNode( dir ); + return this.getCableBus().getGridNode( dir ); } @Override public AECableType getCableConnectionType( final ForgeDirection dir ) { - return this.cb.getCableConnectionType( dir ); + return this.getCableBus().getCableConnectionType( dir ); } @Override public void securityBreak() { - this.cb.securityBreak(); + this.getCableBus().securityBreak(); } // @Override @@ -448,7 +447,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask return 12; } - int getSize( final double a, final double b, final double c, final double d ) + private int getSize( final double a, final double b, final double c, final double d ) { double r = Math.abs( a - 0.5 ); r = Math.max( Math.abs( b - 0.5 ), r ); @@ -479,7 +478,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public IFacadeContainer getFacadeContainer() { - return this.cb.getFacadeContainer(); + return this.getCableBus().getFacadeContainer(); } @Override @@ -533,25 +532,25 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask } } - return this.cb.canAddPart( is, side ); + return this.getCableBus().canAddPart( is, side ); } @Override public ForgeDirection addPart( final ItemStack is, final ForgeDirection side, final EntityPlayer owner ) { - return this.cb.addPart( is, side, owner ); + return this.getCableBus().addPart( is, side, owner ); } @Override public IPart getPart( final ForgeDirection side ) { - return this.cb.getPart( side ); + return this.getCableBus().getPart( side ); } @Override public void removePart( final ForgeDirection side, final boolean suppressUpdate ) { - this.cb.removePart( side, suppressUpdate ); + this.getCableBus().removePart( side, suppressUpdate ); } @Override @@ -572,13 +571,13 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public AEColor getColor() { - return this.cb.getColor(); + return this.getCableBus().getColor(); } @Override public void clearContainer() { - this.cb = new CableBusContainer( this ); + this.setCableBus( new CableBusContainer( this ) ); } @Override @@ -603,7 +602,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public SelectedPart selectPart( final Vec3 pos ) { - return this.cb.selectPart( pos ); + return this.getCableBus().selectPart( pos ); } @Override @@ -629,19 +628,19 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public boolean hasRedstone( final ForgeDirection side ) { - return this.cb.hasRedstone( side ); + return this.getCableBus().hasRedstone( side ); } @Override public boolean isEmpty() { - return this.cb.isEmpty(); + return this.getCableBus().isEmpty(); } @Override public Set getLayerFlags() { - return this.cb.getLayerFlags(); + return this.getCableBus().getLayerFlags(); } @Override @@ -667,14 +666,14 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask @Override public boolean isInWorld() { - return this.cb.isInWorld(); + return this.getCableBus().isInWorld(); } @Override public Iterable getCollisionBoxes() { final LinkedList l = new LinkedList(); - for( final AxisAlignedBB b : this.cb.getSelectedBoundingBoxesFromPool( false, true, null, true ) ) + for( final AxisAlignedBB b : this.getCableBus().getSelectedBoundingBoxesFromPool( false, true, null, true ) ) { l.add( new Cuboid6( b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ ) ); } @@ -697,4 +696,14 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask { return CONNECTION_MASK; } + + public CableBusContainer getCableBus() + { + return this.cb; + } + + private void setCableBus( final CableBusContainer cb ) + { + this.cb = cb; + } } diff --git a/src/main/java/appeng/fmp/FMPEvent.java b/src/main/java/appeng/fmp/FMPEvent.java index c396c467..742baf60 100644 --- a/src/main/java/appeng/fmp/FMPEvent.java +++ b/src/main/java/appeng/fmp/FMPEvent.java @@ -57,10 +57,10 @@ public class FMPEvent @SubscribeEvent public void ServerFMPEvent( final FMPPacketEvent event ) { - FMPEvent.place( event.sender, event.sender.worldObj ); + FMPEvent.place( event.getSender(), event.getSender().worldObj ); } - public static boolean place( final EntityPlayer player, final World world ) + private static boolean place( final EntityPlayer player, final World world ) { final MovingObjectPosition hit = RayTracer.reTrace( world, player ); if( hit == null ) diff --git a/src/main/java/appeng/fmp/FMPPlacementHelper.java b/src/main/java/appeng/fmp/FMPPlacementHelper.java index 8eb7aefd..6f218394 100644 --- a/src/main/java/appeng/fmp/FMPPlacementHelper.java +++ b/src/main/java/appeng/fmp/FMPPlacementHelper.java @@ -108,7 +108,7 @@ public class FMPPlacementHelper implements IPartHost return this.myPart; } - public void removePart() + private void removePart() { if( this.myPart.isEmpty() ) { @@ -307,7 +307,7 @@ public class FMPPlacementHelper implements IPartHost return this.myPart.isInWorld(); } - static class NullStorage extends CableBusStorage + private static class NullStorage extends CableBusStorage { @Override diff --git a/src/main/java/appeng/fmp/QuartzTorchPart.java b/src/main/java/appeng/fmp/QuartzTorchPart.java index 1c4203c7..3534280f 100644 --- a/src/main/java/appeng/fmp/QuartzTorchPart.java +++ b/src/main/java/appeng/fmp/QuartzTorchPart.java @@ -77,7 +77,7 @@ public class QuartzTorchPart extends McSidedMetaPart implements IRandomDisplayTi return this.getBounds( this.meta ); } - public Cuboid6 getBounds( final int meta ) + private Cuboid6 getBounds( final int meta ) { final ForgeDirection up = ForgeDirection.getOrientation( meta ); final double xOff = -0.3 * up.offsetX; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index b52fe247..5c589261 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -105,26 +105,26 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public static final int NUMBER_OF_PATTERN_SLOTS = 9; private static final Collection BAD_BLOCKS = new HashSet( 100 ); - final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; - final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null }; - final MultiCraftingTracker craftingTracker; - final AENetworkProxy gridProxy; - final IInterfaceHost iHost; - final BaseActionSource mySource; - final BaseActionSource interfaceRequestSource; - final ConfigManager cm = new ConfigManager( this ); - final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, NUMBER_OF_CONFIG_SLOTS ); - final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS ); - final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS ); - final WrapperInvSlot slotInv = new WrapperInvSlot( this.storage ); - final MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); - final MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); + private final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; + private final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null }; + private final MultiCraftingTracker craftingTracker; + private final AENetworkProxy gridProxy; + private final IInterfaceHost iHost; + private final BaseActionSource mySource; + private final BaseActionSource interfaceRequestSource; + private final ConfigManager cm = new ConfigManager( this ); + private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, NUMBER_OF_CONFIG_SLOTS ); + private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS ); + private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS ); + private final WrapperInvSlot slotInv = new WrapperInvSlot( this.storage ); + private final MEMonitorPassThrough items = new MEMonitorPassThrough( new NullInventory(), StorageChannel.ITEMS ); + private final MEMonitorPassThrough fluids = new MEMonitorPassThrough( new NullInventory(), StorageChannel.FLUIDS ); private final UpgradeInventory upgrades; - boolean hasConfig = false; - int priority; - List craftingList = null; - List waitingToSend = null; - IMEInventory destination; + private boolean hasConfig = false; + private int priority; + private List craftingList = null; + private List waitingToSend = null; + private IMEInventory destination; private boolean isWorking = false; public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih ) @@ -138,7 +138,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn this.iHost = ih; this.craftingTracker = new MultiCraftingTracker( this.iHost, 9 ); - this.mySource = this.fluids.changeSource = this.items.changeSource = new MachineSource( this.iHost ); + + final MachineSource actionSource = new MachineSource( this.iHost ); + this.mySource = actionSource; + this.fluids.setChangeSource( actionSource ); + this.items.setChangeSource( actionSource ); + this.interfaceRequestSource = new InterfaceRequestSource( this.iHost ); } @@ -244,7 +249,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn this.updateCraftingList(); } - public void addToSendList( final ItemStack is ) + private void addToSendList( final ItemStack is ) { if( is == null ) { @@ -312,7 +317,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn this.notifyNeighbors(); } - public void updateCraftingList() + private void updateCraftingList() { final Boolean[] accountedFor = { false, false, false, false, false, false, false, false, false }; // 9... @@ -365,7 +370,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - public boolean hasWorkToDo() + private boolean hasWorkToDo() { return this.hasItemsToSend() || this.requireWork[0] != null || this.requireWork[1] != null || this.requireWork[2] != null || this.requireWork[3] != null || this.requireWork[4] != null || this.requireWork[5] != null || this.requireWork[6] != null || this.requireWork[7] != null; } @@ -439,7 +444,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - public void addToCraftingList( final ItemStack is ) + private void addToCraftingList( final ItemStack is ) { if( is == null ) { @@ -463,7 +468,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn } } - public boolean hasItemsToSend() + private boolean hasItemsToSend() { return this.waitingToSend != null && !this.waitingToSend.isEmpty(); } @@ -540,7 +545,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.Interface.min, TickRates.Interface.max, !this.hasWorkToDo(), true ); + return new TickingRequest( TickRates.Interface.getMin(), TickRates.Interface.getMax(), !this.hasWorkToDo(), true ); } @Override @@ -772,7 +777,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return this.items; } - public boolean hasConfig() + private boolean hasConfig() { return this.hasConfig; } @@ -870,7 +875,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn @Override public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table ) { - if( this.hasItemsToSend() || !this.gridProxy.isActive() ) + if( this.hasItemsToSend() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) ) { return false; } @@ -1073,7 +1078,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn return null; } - public IPart getPart() + private IPart getPart() { return (IPart) ( this.iHost instanceof IPart ? this.iHost : null ); } @@ -1257,7 +1262,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public InterfaceInventory( final DualityInterface tileInterface ) { super( new AdaptorIInventory( tileInterface.storage ) ); - this.mySource = new MachineSource( DualityInterface.this.iHost ); + this.setActionSource( new MachineSource( DualityInterface.this.iHost ) ); } @Override diff --git a/src/main/java/appeng/helpers/IContainerCraftingPacket.java b/src/main/java/appeng/helpers/IContainerCraftingPacket.java index 5f471401..3ae373e2 100644 --- a/src/main/java/appeng/helpers/IContainerCraftingPacket.java +++ b/src/main/java/appeng/helpers/IContainerCraftingPacket.java @@ -44,7 +44,7 @@ public interface IContainerCraftingPacket /** * @return who are we? */ - BaseActionSource getSource(); + BaseActionSource getActionSource(); /** * @return consume items? diff --git a/src/main/java/appeng/helpers/LocationRotation.java b/src/main/java/appeng/helpers/LocationRotation.java index fb0c578c..2d1412ef 100644 --- a/src/main/java/appeng/helpers/LocationRotation.java +++ b/src/main/java/appeng/helpers/LocationRotation.java @@ -28,10 +28,10 @@ import appeng.api.util.IOrientable; public class LocationRotation implements IOrientable { - final IBlockAccess w; - final int x; - final int y; - final int z; + private final IBlockAccess w; + private final int x; + private final int y; + private final int z; public LocationRotation( final IBlockAccess world, final int x, final int y, final int z ) { diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 5c4ac6ca..5d285c36 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -29,10 +29,10 @@ import appeng.api.util.IOrientable; public class MetaRotation implements IOrientable { - final IBlockAccess w; - final int x; - final int y; - final int z; + private final IBlockAccess w; + private final int x; + private final int y; + private final int z; public MetaRotation( final IBlockAccess world, final int x, final int y, final int z ) { diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index eb4a8256..4a49e588 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -174,7 +174,7 @@ public class MultiCraftingTracker } } - public int getSlot( final ICraftingLink link ) + int getSlot( final ICraftingLink link ) { if( this.links != null ) { @@ -190,7 +190,7 @@ public class MultiCraftingTracker return -1; } - public void cancel() + void cancel() { if( this.links != null ) { @@ -219,7 +219,7 @@ public class MultiCraftingTracker } } - public boolean isBusy( final int slot ) + boolean isBusy( final int slot ) { return this.getLink( slot ) != null || this.getJob( slot ) != null; } diff --git a/src/main/java/appeng/helpers/PlayerSecurityWrapper.java b/src/main/java/appeng/helpers/PlayerSecurityWrapper.java index 006b2dd1..27889752 100644 --- a/src/main/java/appeng/helpers/PlayerSecurityWrapper.java +++ b/src/main/java/appeng/helpers/PlayerSecurityWrapper.java @@ -30,7 +30,7 @@ import appeng.api.networking.security.ISecurityRegistry; public class PlayerSecurityWrapper implements ISecurityRegistry { - final Map> target; + private final Map> target; public PlayerSecurityWrapper( final HashMap> playerPerms ) { diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/main/java/appeng/helpers/Splotch.java index 23cf44a9..f05ffb58 100644 --- a/src/main/java/appeng/helpers/Splotch.java +++ b/src/main/java/appeng/helpers/Splotch.java @@ -30,9 +30,9 @@ import appeng.api.util.AEColor; public class Splotch { - public final ForgeDirection side; - public final boolean lumen; - public final AEColor color; + private final ForgeDirection side; + private final boolean lumen; + private final AEColor color; private final int pos; public Splotch( final AEColor col, final boolean lit, final ForgeDirection side, final Vec3 position ) @@ -82,7 +82,7 @@ public class Splotch public void writeToStream( final ByteBuf stream ) { stream.writeByte( this.pos ); - final int val = this.side.ordinal() | ( this.color.ordinal() << 3 ) | ( this.lumen ? 0x80 : 0x00 ); + final int val = this.getSide().ordinal() | ( this.getColor().ordinal() << 3 ) | ( this.isLumen() ? 0x80 : 0x00 ); stream.writeByte( val ); } @@ -98,7 +98,22 @@ public class Splotch public int getSeed() { - final int val = this.side.ordinal() | ( this.color.ordinal() << 3 ) | ( this.lumen ? 0x80 : 0x00 ); + final int val = this.getSide().ordinal() | ( this.getColor().ordinal() << 3 ) | ( this.isLumen() ? 0x80 : 0x00 ); return Math.abs( this.pos + val ); } + + public ForgeDirection getSide() + { + return this.side; + } + + public AEColor getColor() + { + return this.color; + } + + public boolean isLumen() + { + return this.lumen; + } } diff --git a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java index f2bfb1e1..3741453b 100644 --- a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java +++ b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java @@ -55,16 +55,16 @@ import appeng.tile.networking.TileWireless; public class WirelessTerminalGuiObject implements IPortableCell, IActionHost, IInventorySlotAware { - public final ItemStack effectiveItem; - final IWirelessTermHandler wth; - final String encryptionKey; - final EntityPlayer myPlayer; - IGrid targetGrid; - IStorageGrid sg; - IMEMonitor itemStorage; - IWirelessAccessPoint myWap; - double sqRange = Double.MAX_VALUE; - double myRange = Double.MAX_VALUE; + private final ItemStack effectiveItem; + private final IWirelessTermHandler wth; + private final String encryptionKey; + private final EntityPlayer myPlayer; + private IGrid targetGrid; + private IStorageGrid sg; + private IMEMonitor itemStorage; + private IWirelessAccessPoint myWap; + private double sqRange = Double.MAX_VALUE; + private double myRange = Double.MAX_VALUE; private final int inventorySlot; public WirelessTerminalGuiObject( final IWirelessTermHandler wh, final ItemStack is, final EntityPlayer ep, final World w, final int x, final int y, final int z ) diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index 9b26f549..8c7e0436 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -30,7 +30,7 @@ public class CompassManager { public static final CompassManager INSTANCE = new CompassManager(); - final HashMap requests = new HashMap(); + private final HashMap requests = new HashMap(); public void postResult( final long attunement, final int x, final int y, final int z, final CompassResult result ) { @@ -46,7 +46,7 @@ public class CompassManager while( i.hasNext() ) { final CompassResult res = i.next(); - final long diff = now - res.time; + final long diff = now - res.getTime(); if( diff > 20000 ) { i.remove(); @@ -62,11 +62,11 @@ public class CompassManager this.requests.put( r, res ); this.requestUpdate( r ); } - else if( now - res.time > 1000 * 3 ) + else if( now - res.getTime() > 1000 * 3 ) { - if( !res.requested ) + if( !res.isRequested() ) { - res.requested = true; + res.setRequested( true ); this.requestUpdate( r ); } } @@ -79,15 +79,14 @@ public class CompassManager NetworkHandler.instance.sendToServer( new PacketCompassRequest( r.attunement, r.cx, r.cz, r.cdy ) ); } - static class CompassRequest + private static class CompassRequest { - final int hash; - - final long attunement; - final int cx; - final int cdy; - final int cz; + private final int hash; + private final long attunement; + private final int cx; + private final int cdy; + private final int cz; public CompassRequest( final long attunement, final int x, final int y, final int z ) { diff --git a/src/main/java/appeng/hooks/CompassResult.java b/src/main/java/appeng/hooks/CompassResult.java index 89f047d4..53c0982c 100644 --- a/src/main/java/appeng/hooks/CompassResult.java +++ b/src/main/java/appeng/hooks/CompassResult.java @@ -22,12 +22,11 @@ package appeng.hooks; public class CompassResult { - public final boolean hasResult; - public final boolean spin; - public final double rad; - public final long time; - - public boolean requested = false; + private final boolean hasResult; + private final boolean spin; + private final double rad; + private final long time; + private boolean requested = false; public CompassResult( final boolean hasResult, final boolean spin, final double rad ) { @@ -36,4 +35,34 @@ public class CompassResult this.rad = rad; this.time = System.currentTimeMillis(); } + + public boolean isValidResult() + { + return this.hasResult; + } + + public boolean isSpin() + { + return this.spin; + } + + public double getRad() + { + return this.rad; + } + + boolean isRequested() + { + return this.requested; + } + + void setRequested( final boolean requested ) + { + this.requested = requested; + } + + long getTime() + { + return this.time; + } } diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index c8e4feb5..62066c9a 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -62,14 +62,14 @@ public class TickHandler { public static final TickHandler INSTANCE = new TickHandler(); - final Queue> serverQueue = new LinkedList>(); - final Multimap craftingJobs = LinkedListMultimap.create(); + private final Queue> serverQueue = new LinkedList>(); + private final Multimap craftingJobs = LinkedListMultimap.create(); private final WeakHashMap>> callQueue = new WeakHashMap>>(); private final HandlerRep server = new HandlerRep(); private final HandlerRep client = new HandlerRep(); private final HashMap cliPlayerColors = new HashMap(); private final HashMap srvPlayerColors = new HashMap(); - CableRenderMode crm = CableRenderMode.Standard; + private CableRenderMode crm = CableRenderMode.Standard; public HashMap getPlayerColors() { @@ -108,7 +108,7 @@ public class TickHandler } } - HandlerRep getRepo() + private HandlerRep getRepo() { if( Platform.isServer() ) { @@ -306,14 +306,14 @@ public class TickHandler } } - static class HandlerRep + private static class HandlerRep { - public Queue tiles = new LinkedList(); + private Queue tiles = new LinkedList(); - public Collection networks = new NetworkList(); + private Collection networks = new NetworkList(); - public void clear() + private void clear() { this.tiles = new LinkedList(); this.networks = new NetworkList(); @@ -324,8 +324,8 @@ public class TickHandler { public final AEColor myColor; - protected final int myEntity; - protected int ticksLeft; + private final int myEntity; + private int ticksLeft; public PlayerColor( final int id, final AEColor col, final int ticks ) { diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index d122d751..c066993e 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -32,16 +32,16 @@ import appeng.core.AELog; public final class IntegrationNode { - final String displayName; - final String modID; - final IntegrationType shortName; - IntegrationStage state = IntegrationStage.PRE_INIT; - IntegrationStage failedStage = IntegrationStage.PRE_INIT; - Throwable exception = null; - String name = null; - Class classValue = null; - Object instance; - IIntegrationModule mod = null; + private final String displayName; + private final String modID; + private final IntegrationType shortName; + private IntegrationStage state = IntegrationStage.PRE_INIT; + private IntegrationStage failedStage = IntegrationStage.PRE_INIT; + private Throwable exception = null; + private String name = null; + private Class classValue = null; + private Object instance; + private IIntegrationModule mod = null; public IntegrationNode( final String displayName, final String modID, final IntegrationType shortName, final String name ) { @@ -54,24 +54,24 @@ public final class IntegrationNode @Override public String toString() { - return this.shortName.name() + ':' + this.state.name(); + return this.getShortName().name() + ':' + this.getState().name(); } - public boolean isActive() + boolean isActive() { - if( this.state == IntegrationStage.PRE_INIT ) + if( this.getState() == IntegrationStage.PRE_INIT ) { this.call( IntegrationStage.PRE_INIT ); } - return this.state != IntegrationStage.FAILED; + return this.getState() != IntegrationStage.FAILED; } void call( final IntegrationStage stage ) { - if( this.state != IntegrationStage.FAILED ) + if( this.getState() != IntegrationStage.FAILED ) { - if( this.state.ordinal() > stage.ordinal() ) + if( this.getState().ordinal() > stage.ordinal() ) { return; } @@ -101,24 +101,24 @@ public final class IntegrationNode this.classValue = this.getClass().getClassLoader().loadClass( this.name ); this.mod = (IIntegrationModule) this.classValue.getConstructor().newInstance(); final Field f = this.classValue.getField( "instance" ); - f.set( this.classValue, this.instance = this.mod ); + f.set( this.classValue, this.setInstance( this.mod ) ); } else { throw new ModNotInstalled( this.modID ); } - this.state = IntegrationStage.INIT; + this.setState( IntegrationStage.INIT ); break; case INIT: this.mod.init(); - this.state = IntegrationStage.POST_INIT; + this.setState( IntegrationStage.POST_INIT ); break; case POST_INIT: this.mod.postInit(); - this.state = IntegrationStage.READY; + this.setState( IntegrationStage.READY ); break; case FAILED: @@ -130,13 +130,13 @@ public final class IntegrationNode { this.failedStage = stage; this.exception = t; - this.state = IntegrationStage.FAILED; + this.setState( IntegrationStage.FAILED ); } } if( stage == IntegrationStage.POST_INIT ) { - if( this.state == IntegrationStage.FAILED ) + if( this.getState() == IntegrationStage.FAILED ) { AELog.info( this.displayName + " - Integration Disabled" ); if( !( this.exception instanceof ModNotInstalled ) ) @@ -150,4 +150,30 @@ public final class IntegrationNode } } } + + Object getInstance() + { + return this.instance; + } + + private Object setInstance( final Object instance ) + { + this.instance = instance; + return instance; + } + + IntegrationType getShortName() + { + return this.shortName; + } + + IntegrationStage getState() + { + return this.state; + } + + private void setState( final IntegrationStage state ) + { + this.state = state; + } } diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index 1cec1adf..51e1956d 100644 --- a/src/main/java/appeng/integration/IntegrationRegistry.java +++ b/src/main/java/appeng/integration/IntegrationRegistry.java @@ -83,7 +83,7 @@ public enum IntegrationRegistry builder.append( ", " ); } - final String integrationState = node.shortName + ":" + ( node.state == IntegrationStage.FAILED ? "OFF" : "ON" ); + final String integrationState = node.getShortName() + ":" + ( node.getState() == IntegrationStage.FAILED ? "OFF" : "ON" ); builder.append( integrationState ); } @@ -94,7 +94,7 @@ public enum IntegrationRegistry { for( final IntegrationNode node : this.modules ) { - if( node.shortName == name ) + if( node.getShortName() == name ) { return node.isActive(); } @@ -107,9 +107,9 @@ public enum IntegrationRegistry { for( final IntegrationNode node : this.modules ) { - if( node.shortName == name && node.isActive() ) + if( node.getShortName() == name && node.isActive() ) { - return node.instance; + return node.getInstance(); } } diff --git a/src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java b/src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java index d6b756f6..4fa88d90 100644 --- a/src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java +++ b/src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java @@ -36,8 +36,8 @@ import appeng.integration.abstraction.IBuildCraftTransport; public class BCPipeInventory implements IMEInventory { - final TileEntity te; - final ForgeDirection direction; + private final TileEntity te; + private final ForgeDirection direction; public BCPipeInventory( final TileEntity te, final ForgeDirection direction ) { diff --git a/src/main/java/appeng/integration/modules/BetterStorage.java b/src/main/java/appeng/integration/modules/BetterStorage.java index 9d956996..460a02c9 100644 --- a/src/main/java/appeng/integration/modules/BetterStorage.java +++ b/src/main/java/appeng/integration/modules/BetterStorage.java @@ -54,7 +54,7 @@ public class BetterStorage implements IIntegrationModule, IBetterStorage { if( te instanceof ICrateStorage ) { - return new BSCrateStorageAdaptor( te, d ); + return new BSCrateStorageAdaptor( te ); } return null; } diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index b7c1dab9..bf525284 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -195,7 +195,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF final TMultiPart p = i.next(); if( p instanceof CableBusPart ) { - return ( (CableBusPart) p ).cb; + return ( (CableBusPart) p ).getCableBus(); } } } diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java index 5bacb139..c370b022 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -177,7 +177,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler return RecipeInfo.getOverlayHandler( gui, "crafting2x2" ); } - public boolean isRecipe2x2( final int recipe ) + private boolean isRecipe2x2( final int recipe ) { for( final PositionedStack stack : this.getIngredientStacks( recipe ) ) { @@ -195,11 +195,11 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler return NEIClientUtils.translate( "recipe.shaped" ); } - public class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe + private class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe { - public final List ingredients; - public final PositionedStack result; + private final List ingredients; + private final PositionedStack result; public CachedShapedRecipe( final ShapedRecipe recipe ) { @@ -208,7 +208,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler this.setIngredients( recipe.getWidth(), recipe.getHeight(), recipe.getIngredients() ); } - public void setIngredients( final int width, final int height, final Object[] items ) + private void setIngredients( final int width, final int height, final Object[] items ) { final boolean useSingleItems = AEConfig.instance.disableColoredCableRecipesInNEI(); for( int x = 0; x < width; x++ ) @@ -251,7 +251,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler return this.getCycledIngredients( NEIAEShapedRecipeHandler.this.cycleticks / 20, this.ingredients ); } - public void computeVisuals() + private void computeVisuals() { for( final PositionedStack p : this.ingredients ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index 9baa1754..fabea544 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -177,7 +177,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler return RecipeInfo.getOverlayHandler( gui, "crafting2x2" ); } - public boolean isRecipe2x2( final int recipe ) + private boolean isRecipe2x2( final int recipe ) { for( final PositionedStack stack : this.getIngredientStacks( recipe ) ) { @@ -195,11 +195,11 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler return NEIClientUtils.translate( "recipe.shapeless" ); } - public class CachedShapelessRecipe extends TemplateRecipeHandler.CachedRecipe + private class CachedShapelessRecipe extends TemplateRecipeHandler.CachedRecipe { - public final List ingredients; - public final PositionedStack result; + private final List ingredients; + private final PositionedStack result; public CachedShapelessRecipe( final ShapelessRecipe recipe ) { @@ -220,7 +220,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler return this.getCycledIngredients( NEIAEShapelessRecipeHandler.this.cycleticks / 20, this.ingredients ); } - public void setIngredients( final Object[] items ) + private void setIngredients( final Object[] items ) { final boolean useSingleItems = AEConfig.instance.disableColoredCableRecipesInNEI(); for( int x = 0; x < 3; x++ ) @@ -251,7 +251,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } - public void computeVisuals() + private void computeVisuals() { for( final PositionedStack p : this.ingredients ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java index 7d4db558..01f80b48 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java @@ -44,13 +44,8 @@ import appeng.util.Platform; public class NEICraftingHandler implements IOverlayHandler { - final int offsetX; - final int offsetY; - public NEICraftingHandler( final int x, final int y ) { - this.offsetX = x; - this.offsetY = y; } @Override @@ -69,7 +64,7 @@ public class NEICraftingHandler implements IOverlayHandler } } - public void overlayRecipe( final GuiContainer gui, final List ingredients, final boolean shift ) + private void overlayRecipe( final GuiContainer gui, final List ingredients, final boolean shift ) { try { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java index 912dcad7..d9b59e51 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java @@ -46,8 +46,8 @@ import appeng.items.parts.ItemFacade; public class NEIFacadeRecipeHandler extends TemplateRecipeHandler { - final ItemFacade facade; - final IItemDefinition anchorDefinition; + private final ItemFacade facade; + private final IItemDefinition anchorDefinition; public NEIFacadeRecipeHandler() { @@ -176,7 +176,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler return RecipeInfo.getOverlayHandler( gui, "crafting2x2" ); } - public boolean isRecipe2x2( final int recipe ) + private boolean isRecipe2x2( final int recipe ) { for( final PositionedStack stack : this.getIngredientStacks( recipe ) ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java index 0b2d48c7..7781bae7 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java @@ -183,12 +183,12 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler return GuiText.GrindStone.getLocal(); } - public class CachedGrindStoneRecipe extends TemplateRecipeHandler.CachedRecipe + private class CachedGrindStoneRecipe extends TemplateRecipeHandler.CachedRecipe { - public final List ingredients; - public final PositionedStack result; - public String displayChance; - boolean hasOptional = false; + private final List ingredients; + private final PositionedStack result; + private String displayChance; + private boolean hasOptional = false; public CachedGrindStoneRecipe( final IGrinderEntry recipe ) { @@ -231,7 +231,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler return this.getCycledIngredients( NEIGrinderRecipeHandler.this.cycleticks / 20, this.ingredients ); } - public void computeVisuals() + private void computeVisuals() { for( final PositionedStack p : this.ingredients ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java index 40f49d1e..4ad553c1 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java @@ -160,11 +160,11 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler return GuiText.Inscriber.getLocal(); } - public class CachedInscriberRecipe extends TemplateRecipeHandler.CachedRecipe + private class CachedInscriberRecipe extends TemplateRecipeHandler.CachedRecipe { - public final List ingredients; - public final PositionedStack result; + private final List ingredients; + private final PositionedStack result; public CachedInscriberRecipe( final IInscriberRecipe recipe ) { @@ -196,7 +196,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler return this.getCycledIngredients( NEIInscriberRecipeHandler.this.cycleticks / 20, this.ingredients ); } - public void computeVisuals() + private void computeVisuals() { for( final PositionedStack p : this.ingredients ) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java index 3de7724b..cf22b5d0 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java @@ -181,7 +181,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler return this; } - public NEIWorldCraftingHandler newInstance() + private NEIWorldCraftingHandler newInstance() { try { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/TerminalCraftingSlotFinder.java b/src/main/java/appeng/integration/modules/NEIHelpers/TerminalCraftingSlotFinder.java index e5df3867..d06dcd27 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/TerminalCraftingSlotFinder.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/TerminalCraftingSlotFinder.java @@ -37,8 +37,8 @@ public class TerminalCraftingSlotFinder implements IStackPositioner { if( ps != null ) { - ps.relx += GuiMEMonitorable.CraftingGridOffsetX; - ps.rely += GuiMEMonitorable.CraftingGridOffsetY; + ps.relx += GuiMEMonitorable.craftingGridOffsetX; + ps.rely += GuiMEMonitorable.craftingGridOffsetY; } } return a; diff --git a/src/main/java/appeng/integration/modules/helpers/BSCrate.java b/src/main/java/appeng/integration/modules/helpers/BSCrate.java index c5b43fb8..fa3105ab 100644 --- a/src/main/java/appeng/integration/modules/helpers/BSCrate.java +++ b/src/main/java/appeng/integration/modules/helpers/BSCrate.java @@ -21,7 +21,6 @@ package appeng.integration.modules.helpers; import net.mcft.copy.betterstorage.api.crate.ICrateStorage; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; @@ -35,12 +34,10 @@ import appeng.util.item.AEItemStack; public class BSCrate implements IMEInventory { private final ICrateStorage crateStorage; - private final ForgeDirection side; - public BSCrate( final Object object, final ForgeDirection d ) + public BSCrate( final Object object ) { this.crateStorage = (ICrateStorage) object; - this.side = d; } @Override diff --git a/src/main/java/appeng/integration/modules/helpers/BSCrateHandler.java b/src/main/java/appeng/integration/modules/helpers/BSCrateHandler.java index 60fdfe63..f7bfe7c0 100644 --- a/src/main/java/appeng/integration/modules/helpers/BSCrateHandler.java +++ b/src/main/java/appeng/integration/modules/helpers/BSCrateHandler.java @@ -43,7 +43,7 @@ public class BSCrateHandler implements IExternalStorageHandler { if( channel == StorageChannel.ITEMS ) { - return new BSCrate( te, ForgeDirection.UNKNOWN ); + return new BSCrate( te ); } return null; } diff --git a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java index 25c1d9bf..85219e8f 100644 --- a/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java +++ b/src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java @@ -23,7 +23,6 @@ import java.util.Iterator; import net.mcft.copy.betterstorage.api.crate.ICrateStorage; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; import appeng.api.config.FuzzyMode; import appeng.util.InventoryAdaptor; @@ -36,13 +35,11 @@ import appeng.util.iterators.StackToSlotIterator; public class BSCrateStorageAdaptor extends InventoryAdaptor { - final ICrateStorage cs; - final ForgeDirection side; + private final ICrateStorage cs; - public BSCrateStorageAdaptor( final Object te, final ForgeDirection d ) + public BSCrateStorageAdaptor( final Object te ) { this.cs = (ICrateStorage) te; - this.side = d; } @Override diff --git a/src/main/java/appeng/integration/modules/helpers/FMPPacketEvent.java b/src/main/java/appeng/integration/modules/helpers/FMPPacketEvent.java index 5e61e5fb..7a1cb30e 100644 --- a/src/main/java/appeng/integration/modules/helpers/FMPPacketEvent.java +++ b/src/main/java/appeng/integration/modules/helpers/FMPPacketEvent.java @@ -27,10 +27,15 @@ import cpw.mods.fml.common.eventhandler.Event; public class FMPPacketEvent extends Event { - public final EntityPlayerMP sender; + private final EntityPlayerMP sender; public FMPPacketEvent( final EntityPlayerMP sender ) { this.sender = sender; } + + public EntityPlayerMP getSender() + { + return this.sender; + } } diff --git a/src/main/java/appeng/integration/modules/helpers/FactorizationBarrel.java b/src/main/java/appeng/integration/modules/helpers/FactorizationBarrel.java index 6b0aa6d8..0f2f2f25 100644 --- a/src/main/java/appeng/integration/modules/helpers/FactorizationBarrel.java +++ b/src/main/java/appeng/integration/modules/helpers/FactorizationBarrel.java @@ -35,7 +35,7 @@ import appeng.util.item.AEItemStack; public class FactorizationBarrel implements IMEInventory { - final IFZ fProxy; + private final IFZ fProxy; private final TileEntity te; public FactorizationBarrel( final IFZ proxy, final TileEntity tile ) @@ -102,12 +102,12 @@ public class FactorizationBarrel implements IMEInventory return input; } - public long remainingItemTypes() + private long remainingItemTypes() { return this.fProxy.barrelGetItem( this.te ) == null ? 1 : 0; } - public boolean containsItemType( final IAEItemStack i, final boolean acceptEmpty ) + private boolean containsItemType( final IAEItemStack i, final boolean acceptEmpty ) { final ItemStack currentItem = this.fProxy.barrelGetItem( this.te ); @@ -120,7 +120,7 @@ public class FactorizationBarrel implements IMEInventory return i.equals( currentItem ); } - public long storedItemCount() + private long storedItemCount() { return this.fProxy.barrelGetItemCount( this.te ); } diff --git a/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java b/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java index 8a55824a..cb955b7c 100644 --- a/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java +++ b/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java @@ -36,12 +36,10 @@ import appeng.util.item.AEItemStack; public class MinefactoryReloadedDeepStorageUnit implements IMEInventory { - final IDeepStorageUnit dsu; - final TileEntity te; + private final IDeepStorageUnit dsu; public MinefactoryReloadedDeepStorageUnit( final TileEntity ta ) { - this.te = ta; this.dsu = (IDeepStorageUnit) ta; } diff --git a/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java index b9509c0b..9ad6e448 100644 --- a/src/main/java/appeng/items/contents/CellConfig.java +++ b/src/main/java/appeng/items/contents/CellConfig.java @@ -28,7 +28,7 @@ import appeng.util.Platform; public class CellConfig extends AppEngInternalInventory { - final ItemStack is; + private final ItemStack is; public CellConfig( final ItemStack is ) { diff --git a/src/main/java/appeng/items/contents/CellUpgrades.java b/src/main/java/appeng/items/contents/CellUpgrades.java index acc5fbd2..14975d68 100644 --- a/src/main/java/appeng/items/contents/CellUpgrades.java +++ b/src/main/java/appeng/items/contents/CellUpgrades.java @@ -27,7 +27,7 @@ import appeng.util.Platform; public final class CellUpgrades extends StackUpgradeInventory { - final ItemStack is; + private final ItemStack is; public CellUpgrades( final ItemStack is, final int upgrades ) { diff --git a/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java index 68b7f408..e792c492 100644 --- a/src/main/java/appeng/items/contents/NetworkToolViewer.java +++ b/src/main/java/appeng/items/contents/NetworkToolViewer.java @@ -32,9 +32,9 @@ import appeng.util.Platform; public class NetworkToolViewer implements INetworkTool { - final AppEngInternalInventory inv; - final ItemStack is; - final IGridHost gh; + private final AppEngInternalInventory inv; + private final ItemStack is; + private final IGridHost gh; public NetworkToolViewer( final ItemStack is, final IGridHost gHost ) { diff --git a/src/main/java/appeng/items/contents/QuartzKnifeObj.java b/src/main/java/appeng/items/contents/QuartzKnifeObj.java index e12bef47..a06e032d 100644 --- a/src/main/java/appeng/items/contents/QuartzKnifeObj.java +++ b/src/main/java/appeng/items/contents/QuartzKnifeObj.java @@ -27,7 +27,7 @@ import appeng.api.implementations.guiobjects.IGuiItemObject; public class QuartzKnifeObj implements IGuiItemObject { - final ItemStack is; + private final ItemStack is; public QuartzKnifeObj( final ItemStack o ) { diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index 25870a71..01d11025 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -71,9 +71,10 @@ import appeng.util.Platform; public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule { - public static final int KILO_SCALAR = 1024; public static ItemMultiMaterial instance; + private static final int KILO_SCALAR = 1024; + private final Map dmgToMaterial = new HashMap(); private final NameResolver nameResolver; @@ -182,13 +183,13 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo enabled = enabled && AEConfig.instance.isFeatureEnabled( f ); } - mat.stackSrc = new MaterialStackSrc( mat ); + mat.setStackSrc( new MaterialStackSrc( mat ) ); if( enabled ) { - mat.itemInstance = this; + mat.setItemInstance( this ); mat.markReady(); - final int newMaterialNum = mat.damageValue; + final int newMaterialNum = mat.getDamageValue(); if( this.dmgToMaterial.get( newMaterialNum ) == null ) { @@ -201,7 +202,7 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo } } - return mat.stackSrc; + return mat.getStackSrc(); } public void makeUnique() @@ -245,13 +246,13 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo } else { - if( mt.itemInstance == this ) + if( mt.getItemInstance() == this ) { - this.dmgToMaterial.remove( mt.damageValue ); + this.dmgToMaterial.remove( mt.getDamageValue() ); } - mt.itemInstance = replacement.getItem(); - mt.damageValue = replacement.getItemDamage(); + mt.setItemInstance( replacement.getItem() ); + mt.setDamageValue( replacement.getItemDamage() ); } } } @@ -262,7 +263,7 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo { if( this.dmgToMaterial.containsKey( dmg ) ) { - return this.dmgToMaterial.get( dmg ).IIcon; + return this.dmgToMaterial.get( dmg ).getIIcon(); } return new MissingIcon( this ); } @@ -305,9 +306,9 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo for( final MaterialType mat : types ) { - if( mat.damageValue >= 0 && mat.isRegistered() && mat.itemInstance == this ) + if( mat.getDamageValue() >= 0 && mat.isRegistered() && mat.getItemInstance() == this ) { - itemStacks.add( new ItemStack( this, 1, mat.damageValue ) ); + itemStacks.add( new ItemStack( this, 1, mat.getDamageValue() ) ); } } } @@ -317,13 +318,13 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo { for( final MaterialType mat : MaterialType.values() ) { - if( mat.damageValue != -1 ) + if( mat.getDamageValue() != -1 ) { - final ItemStack what = new ItemStack( this, 1, mat.damageValue ); + final ItemStack what = new ItemStack( this, 1, mat.getDamageValue() ); if( this.getTypeByStack( what ) != MaterialType.InvalidType ) { final String tex = "appliedenergistics2:" + this.nameOf( what ); - mat.IIcon = icoRegister.registerIcon( tex ); + mat.setIIcon( icoRegister.registerIcon( tex ) ); } } } diff --git a/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java index b01bb983..75f1a1f9 100644 --- a/src/main/java/appeng/items/materials/MaterialType.java +++ b/src/main/java/appeng/items/materials/MaterialType.java @@ -120,31 +120,31 @@ public enum MaterialType private final EnumSet features; // IIcon for the material. @SideOnly( Side.CLIENT ) - public IIcon IIcon; - public Item itemInstance; - public int damageValue; + private IIcon IIcon; + private Item itemInstance; + private int damageValue; // stack! - public MaterialStackSrc stackSrc; + private MaterialStackSrc stackSrc; private String oreName; private Class droppedEntity; private boolean isRegistered = false; MaterialType( final int metaValue ) { - this.damageValue = metaValue; + this.setDamageValue( metaValue ); this.features = EnumSet.of( AEFeature.Core ); } MaterialType( final int metaValue, final AEFeature part ) { - this.damageValue = metaValue; + this.setDamageValue( metaValue ); this.features = EnumSet.of( part ); } MaterialType( final int metaValue, final AEFeature part, final Class c ) { this.features = EnumSet.of( part ); - this.damageValue = metaValue; + this.setDamageValue( metaValue ); this.droppedEntity = c; EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); @@ -153,7 +153,7 @@ public enum MaterialType MaterialType( final int metaValue, final AEFeature part, final String oreDictionary, final Class c ) { this.features = EnumSet.of( part ); - this.damageValue = metaValue; + this.setDamageValue( metaValue ); this.oreName = oreDictionary; this.droppedEntity = c; EntityRegistry.registerModEntity( this.droppedEntity, this.droppedEntity.getSimpleName(), EntityIds.get( this.droppedEntity ), AppEng.instance(), 16, 4, true ); @@ -162,16 +162,16 @@ public enum MaterialType MaterialType( final int metaValue, final AEFeature part, final String oreDictionary ) { this.features = EnumSet.of( part ); - this.damageValue = metaValue; + this.setDamageValue( metaValue ); this.oreName = oreDictionary; } public ItemStack stack( final int size ) { - return new ItemStack( this.itemInstance, size, this.damageValue ); + return new ItemStack( this.getItemInstance(), size, this.getDamageValue() ); } - public EnumSet getFeature() + EnumSet getFeature() { return this.features; } @@ -181,12 +181,12 @@ public enum MaterialType return this.oreName; } - public boolean hasCustomEntity() + boolean hasCustomEntity() { return this.droppedEntity != null; } - public Class getCustomEntityClass() + Class getCustomEntityClass() { return this.droppedEntity; } @@ -196,9 +196,49 @@ public enum MaterialType return this.isRegistered; } - public void markReady() + void markReady() { this.isRegistered = true; } + public int getDamageValue() + { + return this.damageValue; + } + + void setDamageValue( final int damageValue ) + { + this.damageValue = damageValue; + } + + public Item getItemInstance() + { + return this.itemInstance; + } + + void setItemInstance( final Item itemInstance ) + { + this.itemInstance = itemInstance; + } + + IIcon getIIcon() + { + return this.IIcon; + } + + void setIIcon( final IIcon iIcon ) + { + this.IIcon = iIcon; + } + + MaterialStackSrc getStackSrc() + { + return this.stackSrc; + } + + void setStackSrc( final MaterialStackSrc stackSrc ) + { + this.stackSrc = stackSrc; + } + } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 599600b1..18c228af 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -56,17 +56,17 @@ import appeng.util.Platform; public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal { - public static final int LEVEL_OFFSET = 200; - public static final int SINGLE_OFFSET = LEVEL_OFFSET * 3; + private static final int LEVEL_OFFSET = 200; + private static final int SINGLE_OFFSET = LEVEL_OFFSET * 3; public static final int CERTUS = 0; public static final int NETHER = SINGLE_OFFSET; public static final int FLUIX = SINGLE_OFFSET * 2; public static final int FINAL_STAGE = SINGLE_OFFSET * 3; - final IIcon[] certus = new IIcon[3]; - final IIcon[] fluix = new IIcon[3]; - final IIcon[] nether = new IIcon[3]; + private final IIcon[] certus = new IIcon[3]; + private final IIcon[] fluix = new IIcon[3]; + private final IIcon[] nether = new IIcon[3]; public ItemCrystalSeed() { diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 5a26b420..1f7a7ada 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -38,7 +38,7 @@ import appeng.util.Platform; public class ItemPaintBall extends AEBaseItem { - public static final int DAMAGE_THRESHOLD = 20; + private static final int DAMAGE_THRESHOLD = 20; public ItemPaintBall() { @@ -57,7 +57,7 @@ public class ItemPaintBall extends AEBaseItem return super.getItemStackDisplayName( is ) + " - " + this.getExtraName( is ); } - public String getExtraName( final ItemStack is ) + private String getExtraName( final ItemStack is ) { return ( is.getItemDamage() >= DAMAGE_THRESHOLD ? GuiText.Lumen.getLocal() + ' ' : "" ) + this.getColor( is ); } diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 081cdfd7..6ee10e9f 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -132,7 +132,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG enabled &= IntegrationRegistry.INSTANCE.isEnabled( integrationType ); } - final int partDamage = mat.baseDamage + varID; + final int partDamage = mat.getBaseDamage() + varID; final ActivityState state = ActivityState.from( enabled ); final ItemStackSrc output = new ItemStackSrc( this, partDamage, state ); @@ -259,7 +259,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG } } - public String getName( final ItemStack is ) + private String getName( final ItemStack is ) { Preconditions.checkNotNull( is ); @@ -296,12 +296,12 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG try { - if( type.constructor == null ) + if( type.getConstructor() == null ) { - type.constructor = part.getConstructor( ItemStack.class ); + type.setConstructor( part.getConstructor( ItemStack.class ) ); } - return type.constructor.newInstance( is ); + return type.getConstructor().newInstance( is ); } catch( final InstantiationException e ) { diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index e9c35af7..3f837657 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -164,12 +164,12 @@ public enum PartType InterfaceTerminal( 480, EnumSet.of( AEFeature.InterfaceTerminal ), EnumSet.noneOf( IntegrationType.class ), PartInterfaceTerminal.class ); - public final int baseDamage; + private final int baseDamage; private final Set features; private final Set integrations; private final Class myPart; private final GuiText extraName; - public Constructor constructor; + private Constructor constructor; PartType( final int baseMetaValue, final Set features, final Set integrations, final Class c ) { @@ -190,24 +190,39 @@ public enum PartType return false; } - public Set getFeature() + Set getFeature() { return this.features; } - public Set getIntegrations() + Set getIntegrations() { return this.integrations; } - public Class getPart() + Class getPart() { return this.myPart; } - public GuiText getExtraName() + GuiText getExtraName() { return this.extraName; } + Constructor getConstructor() + { + return this.constructor; + } + + void setConstructor( final Constructor constructor ) + { + this.constructor = constructor; + } + + int getBaseDamage() + { + return this.baseDamage; + } + } diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index fdbf728d..92359c5a 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -182,7 +182,7 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag return new TransitionResult( false, 0 ); } - public World createNewWorld( final ItemStack is ) + private World createNewWorld( final ItemStack is ) { final NBTTagCompound c = Platform.openNbtData( is ); final int newDim = DimensionManager.getNextFreeDimId(); diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 803d7db8..a88c06b5 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -82,7 +82,7 @@ import appeng.util.item.AEItemStack; public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - static final Map ORE_TO_COLOR = new HashMap(); + private static final Map ORE_TO_COLOR = new HashMap(); static { @@ -216,7 +216,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return this.getColorFromItem( this.getColor( tol ) ); } - public AEColor getColorFromItem( final ItemStack paintBall ) + private AEColor getColorFromItem( final ItemStack paintBall ) { if( paintBall == null ) { @@ -337,7 +337,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe return newColor; } - public void setColor( final ItemStack is, final ItemStack newColor ) + private void setColor( final ItemStack is, final ItemStack newColor ) { final NBTTagCompound data = Platform.openNbtData( is ); if( newColor == null ) diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 661222e0..e9a3ad2b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -135,18 +135,18 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT r = this.heatUp.get( new InWorldToolOperationIngredient( blockID, OreDictionary.WILDCARD_VALUE ) ); } - if( r.BlockItem != null ) + if( r.getBlockItem() != null ) { - w.setBlock( x, y, z, Block.getBlockFromItem( r.BlockItem.getItem() ), r.BlockItem.getItemDamage(), 3 ); + w.setBlock( x, y, z, Block.getBlockFromItem( r.getBlockItem().getItem() ), r.getBlockItem().getItemDamage(), 3 ); } else { w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 ); } - if( r.Drops != null ) + if( r.getDrops() != null ) { - Platform.spawnDrops( w, x, y, z, r.Drops ); + Platform.spawnDrops( w, x, y, z, r.getDrops() ); } } @@ -171,18 +171,18 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT r = this.coolDown.get( new InWorldToolOperationIngredient( blockID, OreDictionary.WILDCARD_VALUE ) ); } - if( r.BlockItem != null ) + if( r.getBlockItem() != null ) { - w.setBlock( x, y, z, Block.getBlockFromItem( r.BlockItem.getItem() ), r.BlockItem.getItemDamage(), 3 ); + w.setBlock( x, y, z, Block.getBlockFromItem( r.getBlockItem().getItem() ), r.getBlockItem().getItemDamage(), 3 ); } else { w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 ); } - if( r.Drops != null ) + if( r.getDrops() != null ) { - Platform.spawnDrops( w, x, y, z, r.Drops ); + Platform.spawnDrops( w, x, y, z, r.getDrops() ); } } @@ -319,18 +319,18 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT final InWorldToolOperationResult or = InWorldToolOperationResult.getBlockOperationResult( out.toArray( new ItemStack[out.size()] ) ); w.playSoundEffect( x + 0.5D, y + 0.5D, z + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F ); - if( or.BlockItem == null ) + if( or.getBlockItem() == null ) { w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 ); } else { - w.setBlock( x, y, z, Block.getBlockFromItem( or.BlockItem.getItem() ), or.BlockItem.getItemDamage(), 3 ); + w.setBlock( x, y, z, Block.getBlockFromItem( or.getBlockItem().getItem() ), or.getBlockItem().getItemDamage(), 3 ); } - if( or.Drops != null ) + if( or.getDrops() != null ) { - Platform.spawnDrops( w, x, y, z, or.Drops ); + Platform.spawnDrops( w, x, y, z, or.getDrops() ); } return true; diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index 8bd513f8..066d9d55 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -71,17 +71,17 @@ public class Grid implements IGrid center.setGrid( this ); } - public int getPriority() + int getPriority() { return this.priority; } - public IGridStorage getMyStorage() + IGridStorage getMyStorage() { return this.myStorage; } - public Map, GridCacheWrapper> getCaches() + Map, GridCacheWrapper> getCaches() { return this.caches; } @@ -91,7 +91,7 @@ public class Grid implements IGrid return this.machines.keySet(); } - public int size() + int size() { int out = 0; for( final Collection x : this.machines.values() ) @@ -101,7 +101,7 @@ public class Grid implements IGrid return out; } - public void remove( final GridNode gridNode ) + void remove( final GridNode gridNode ) { for( final IGridCache c : this.caches.values() ) { @@ -134,7 +134,7 @@ public class Grid implements IGrid } } - public void add( final GridNode gridNode ) + void add( final GridNode gridNode ) { final Class mClass = gridNode.getMachineClass(); @@ -213,7 +213,7 @@ public class Grid implements IGrid @SuppressWarnings( "unchecked" ) public C getCache( final Class iface ) { - return (C) this.caches.get( iface ).myCache; + return (C) this.caches.get( iface ).getCache(); } @Override @@ -265,7 +265,7 @@ public class Grid implements IGrid return this.pivot; } - public void setPivot( final GridNode pivot ) + void setPivot( final GridNode pivot ) { this.pivot = pivot; } @@ -282,7 +282,7 @@ public class Grid implements IGrid } } - public void saveState() + void saveState() { for( final IGridCache c : this.caches.values() ) { diff --git a/src/main/java/appeng/me/GridCacheWrapper.java b/src/main/java/appeng/me/GridCacheWrapper.java index 499c3b55..2825faa4 100644 --- a/src/main/java/appeng/me/GridCacheWrapper.java +++ b/src/main/java/appeng/me/GridCacheWrapper.java @@ -28,53 +28,58 @@ import appeng.api.networking.IGridStorage; public class GridCacheWrapper implements IGridCache { - final IGridCache myCache; - final String name; + private final IGridCache myCache; + private final String name; public GridCacheWrapper( final IGridCache gc ) { this.myCache = gc; - this.name = this.myCache.getClass().getName(); + this.name = this.getCache().getClass().getName(); } @Override public void onUpdateTick() { - this.myCache.onUpdateTick(); + this.getCache().onUpdateTick(); } @Override public void removeNode( final IGridNode gridNode, final IGridHost machine ) { - this.myCache.removeNode( gridNode, machine ); + this.getCache().removeNode( gridNode, machine ); } @Override public void addNode( final IGridNode gridNode, final IGridHost machine ) { - this.myCache.addNode( gridNode, machine ); + this.getCache().addNode( gridNode, machine ); } @Override public void onSplit( final IGridStorage storageB ) { - this.myCache.onSplit( storageB ); + this.getCache().onSplit( storageB ); } @Override public void onJoin( final IGridStorage storageB ) { - this.myCache.onJoin( storageB ); + this.getCache().onJoin( storageB ); } @Override public void populateGridStorage( final IGridStorage storage ) { - this.myCache.populateGridStorage( storage ); + this.getCache().populateGridStorage( storage ); } public String getName() { return this.name; } + + IGridCache getCache() + { + return this.myCache; + } } diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index d21e11af..690dc166 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -44,8 +44,8 @@ public class GridConnection implements IGridConnection, IPathItem { private static final MENetworkChannelsChanged EVENT = new MENetworkChannelsChanged(); - public int channelData = 0; - Object visitorIterationNumber = null; + private int channelData = 0; + private Object visitorIterationNumber = null; private GridNode sideA; private ForgeDirection fromAtoB; private GridNode sideB; @@ -63,8 +63,8 @@ public class GridConnection implements IGridConnection, IPathItem final DimensionalCoord aCoordinates = a.getGridBlock().getLocation(); final DimensionalCoord bCoordinates = b.getGridBlock().getLocation(); - AELog.info( "Security audit 1 failed at [%s] belonging to player [id=%d]", aCoordinates.toString(), a.playerID ); - AELog.info( "Security audit 2 failed at [%s] belonging to player [id=%d]", bCoordinates.toString(), b.playerID ); + AELog.info( "Security audit 1 failed at [%s] belonging to player [id=%d]", aCoordinates.toString(), a.getPlayerID() ); + AELog.info( "Security audit 2 failed at [%s] belonging to player [id=%d]", bCoordinates.toString(), b.getPlayerID() ); } throw new FailedConnection(); @@ -269,8 +269,18 @@ public class GridConnection implements IGridConnection, IPathItem } } - public int getLastUsedChannels() + private int getLastUsedChannels() { return this.channelData & 0xff; } + + Object getVisitorIterationNumber() + { + return this.visitorIterationNumber; + } + + void setVisitorIterationNumber( final Object visitorIterationNumber ) + { + this.visitorIterationNumber = visitorIterationNumber; + } } diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index ef2962e9..8d0874ac 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -63,9 +63,9 @@ public class GridNode implements IGridNode, IPathItem private final List connections = new LinkedList(); private final IGridBlock gridProxy; // old power draw, used to diff - public double previousDraw = 0.0; - public long lastSecurityKey = -1; - public int playerID = -1; + private double previousDraw = 0.0; + private long lastSecurityKey = -1; + private int playerID = -1; private GridStorage myStorage = null; private Grid myGrid; private Object visitorIterationNumber = null; @@ -79,12 +79,12 @@ public class GridNode implements IGridNode, IPathItem this.gridProxy = what; } - public IGridBlock getGridProxy() + IGridBlock getGridProxy() { return this.gridProxy; } - public Grid getMyGrid() + Grid getMyGrid() { return this.myGrid; } @@ -94,12 +94,12 @@ public class GridNode implements IGridNode, IPathItem return this.lastUsedChannels; } - public Class getMachineClass() + Class getMachineClass() { return this.getMachine().getClass(); } - public void addConnection( final IGridConnection gridConnection ) + void addConnection( final IGridConnection gridConnection ) { this.connections.add( gridConnection ); if( gridConnection.hasDirection() ) @@ -112,7 +112,7 @@ public class GridNode implements IGridNode, IPathItem Collections.sort( this.connections, new ConnectionComparator( gn ) ); } - public void removeConnection( final IGridConnection gridConnection ) + void removeConnection( final IGridConnection gridConnection ) { this.connections.remove( gridConnection ); if( gridConnection.hasDirection() ) @@ -121,7 +121,7 @@ public class GridNode implements IGridNode, IPathItem } } - public boolean hasConnection( final IGridNode otherSide ) + boolean hasConnection( final IGridNode otherSide ) { for( final IGridConnection gc : this.connections ) { @@ -133,11 +133,11 @@ public class GridNode implements IGridNode, IPathItem return false; } - public void validateGrid() + void validateGrid() { final GridSplitDetector gsd = new GridSplitDetector( this.getInternalGrid().getPivot() ); this.beginVisit( gsd ); - if( !gsd.pivotFound ) + if( !gsd.isPivotFound() ) { final IGridVisitor gp = new GridPropagator( new Grid( this ) ); this.beginVisit( gp ); @@ -230,7 +230,7 @@ public class GridNode implements IGridNode, IPathItem return this.myGrid; } - public void setGrid( final Grid grid ) + void setGrid( final Grid grid ) { if( this.myGrid == grid ) { @@ -328,7 +328,7 @@ public class GridNode implements IGridNode, IPathItem { final NBTTagCompound node = nodeData.getCompoundTag( name ); this.playerID = node.getInteger( "p" ); - this.lastSecurityKey = node.getLong( "k" ); + this.setLastSecurityKey( node.getLong( "k" ) ); final long storageID = node.getLong( "g" ); final GridStorage gridStorage = WorldData.instance().storageData().getGridStorage( storageID ); @@ -348,7 +348,7 @@ public class GridNode implements IGridNode, IPathItem final NBTTagCompound node = new NBTTagCompound(); node.setInteger( "p", this.playerID ); - node.setLong( "k", this.lastSecurityKey ); + node.setLong( "k", this.getLastSecurityKey() ); node.setLong( "g", this.myStorage.getID() ); nodeData.setTag( name, node ); @@ -386,12 +386,12 @@ public class GridNode implements IGridNode, IPathItem } } - public int getUsedChannels() + private int getUsedChannels() { return this.usedChannels; } - public void FindConnections() + private void FindConnections() { if( !this.gridProxy.isWorldAccessible() ) { @@ -444,7 +444,7 @@ public class GridNode implements IGridNode, IPathItem } else if( isValidConnection ) { - if( node.lastSecurityKey != -1 ) + if( node.getLastSecurityKey() != -1 ) { newSecurityConnections.add( f ); } @@ -505,7 +505,7 @@ public class GridNode implements IGridNode, IPathItem return null; } - public boolean canConnect( final GridNode from, final ForgeDirection dir ) + private boolean canConnect( final GridNode from, final ForgeDirection dir ) { if( !this.isValidDirection( dir ) ) { @@ -525,7 +525,7 @@ public class GridNode implements IGridNode, IPathItem return ( this.compressedData & ( 1 << ( 8 + dir.ordinal() ) ) ) > 0; } - public AEColor getColor() + private AEColor getColor() { return AEColor.values()[( this.compressedData >> 3 ) & 0x1F]; } @@ -539,9 +539,9 @@ public class GridNode implements IGridNode, IPathItem final GridNode gn = (GridNode) gc.getOtherSide( this ); final GridConnection gcc = (GridConnection) gc; - if( gcc.visitorIterationNumber != tracker ) + if( gcc.getVisitorIterationNumber() != tracker ) { - gcc.visitorIterationNumber = tracker; + gcc.setVisitorIterationNumber( tracker ); nextConnections.add( gc ); } @@ -577,12 +577,12 @@ public class GridNode implements IGridNode, IPathItem } } - public GridStorage getGridStorage() + GridStorage getGridStorage() { return this.myStorage; } - public void setGridStorage( final GridStorage s ) + void setGridStorage( final GridStorage s ) { this.myStorage = s; this.usedChannels = 0; @@ -622,7 +622,7 @@ public class GridNode implements IGridNode, IPathItem return this.getUsedChannels() < this.getMaxChannels(); } - public int getMaxChannels() + private int getMaxChannels() { return CHANNEL_COUNT[this.compressedData & 0x03]; } @@ -664,11 +664,31 @@ public class GridNode implements IGridNode, IPathItem } } - public int getLastUsedChannels() + private int getLastUsedChannels() { return this.lastUsedChannels; } + public long getLastSecurityKey() + { + return this.lastSecurityKey; + } + + public void setLastSecurityKey( final long lastSecurityKey ) + { + this.lastSecurityKey = lastSecurityKey; + } + + public double getPreviousDraw() + { + return this.previousDraw; + } + + public void setPreviousDraw( final double previousDraw ) + { + this.previousDraw = previousDraw; + } + private static class MachineSecurityBreak implements IWorldCallable { private final GridNode node; @@ -679,7 +699,7 @@ public class GridNode implements IGridNode, IPathItem } @Override - public Void call( final World world) throws Exception + public Void call( final World world ) throws Exception { this.node.getMachine().securityBreak(); diff --git a/src/main/java/appeng/me/GridSplitDetector.java b/src/main/java/appeng/me/GridSplitDetector.java index d406c005..ac0b98c7 100644 --- a/src/main/java/appeng/me/GridSplitDetector.java +++ b/src/main/java/appeng/me/GridSplitDetector.java @@ -26,8 +26,8 @@ import appeng.api.networking.IGridVisitor; class GridSplitDetector implements IGridVisitor { - final IGridNode pivot; - boolean pivotFound; + private final IGridNode pivot; + private boolean pivotFound; public GridSplitDetector( final IGridNode pivot ) { @@ -39,9 +39,19 @@ class GridSplitDetector implements IGridVisitor { if( n == this.pivot ) { - this.pivotFound = true; + this.setPivotFound( true ); } - return !this.pivotFound; + return !this.isPivotFound(); + } + + public boolean isPivotFound() + { + return this.pivotFound; + } + + private void setPivotFound( final boolean pivotFound ) + { + this.pivotFound = pivotFound; } } diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 29254c80..42b3fd3f 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -37,11 +37,10 @@ import appeng.core.worlddata.WorldData; public class GridStorage implements IGridStorage { - final long myID; - final NBTTagCompound data; - final GridStorageSearch mySearchEntry; // keep myself in the list until I'm + private final long myID; + private final NBTTagCompound data; + private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm private final WeakHashMap divided = new WeakHashMap(); - public boolean isDirty = false; private WeakReference internalGrid = null; // lost... @@ -97,8 +96,6 @@ public class GridStorage implements IGridStorage public String getValue() { - this.isDirty = false; - final Grid currentGrid = (Grid) this.getGrid(); if( currentGrid != null ) { @@ -124,7 +121,7 @@ public class GridStorage implements IGridStorage return this.internalGrid == null ? null : this.internalGrid.get(); } - public void setGrid( final Grid grid ) + void setGrid( final Grid grid ) { this.internalGrid = new WeakReference( grid ); } @@ -141,22 +138,17 @@ public class GridStorage implements IGridStorage return this.myID; } - public void markDirty() - { - this.isDirty = true; - } - - public void addDivided( final GridStorage gs ) + void addDivided( final GridStorage gs ) { this.divided.put( gs, true ); } - public boolean hasDivided( final GridStorage myStorage ) + boolean hasDivided( final GridStorage myStorage ) { return this.divided.containsKey( myStorage ); } - public void remove() + void remove() { WorldData.instance().storageData().destroyGridStorage( this.myID ); } diff --git a/src/main/java/appeng/me/GridStorageSearch.java b/src/main/java/appeng/me/GridStorageSearch.java index a95633e4..cd8875ca 100644 --- a/src/main/java/appeng/me/GridStorageSearch.java +++ b/src/main/java/appeng/me/GridStorageSearch.java @@ -25,8 +25,8 @@ import java.lang.ref.WeakReference; public class GridStorageSearch { - final long id; - public WeakReference gridStorage; + private final long id; + private WeakReference gridStorage; /** * for use with the world settings @@ -64,4 +64,14 @@ public class GridStorageSearch return false; } + + public WeakReference getGridStorage() + { + return this.gridStorage; + } + + public void setGridStorage( final WeakReference gridStorage ) + { + this.gridStorage = gridStorage; + } } diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 7f13c7e3..90e777b1 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -39,7 +39,7 @@ public class NetworkEventBus private static final Collection READ_CLASSES = new HashSet(); private static final Map, Map> EVENTS = new HashMap, Map>(); - public void readClass( final Class listAs, final Class c ) + void readClass( final Class listAs, final Class c ) { if( READ_CLASSES.contains( c ) ) { @@ -94,7 +94,7 @@ public class NetworkEventBus } } - public MENetworkEvent postEvent( final Grid g, final MENetworkEvent e ) + MENetworkEvent postEvent( final Grid g, final MENetworkEvent e ) { final Map subscribers = EVENTS.get( e.getClass() ); int x = 0; @@ -110,7 +110,7 @@ public class NetworkEventBus if( cache != null ) { x++; - target.invoke( cache.myCache, e ); + target.invoke( cache.getCache(), e ); } for( final IGridNode obj : g.getMachines( subscriber.getKey() ) ) @@ -130,7 +130,7 @@ public class NetworkEventBus return e; } - public MENetworkEvent postEventTo( final Grid grid, final GridNode node, final MENetworkEvent e ) + MENetworkEvent postEventTo( final Grid grid, final GridNode node, final MENetworkEvent e ) { final Map subscribers = EVENTS.get( e.getClass() ); int x = 0; @@ -156,18 +156,18 @@ public class NetworkEventBus return e; } - static class NetworkEventDone extends Throwable + private static class NetworkEventDone extends Throwable { private static final long serialVersionUID = -3079021487019171205L; } - class EventMethod + private class EventMethod { - public final Class objClass; - public final Method objMethod; - public final Class objEvent; + private final Class objClass; + private final Method objMethod; + private final Class objEvent; public EventMethod( final Class Event, final Class ObjClass, final Method ObjMethod ) { @@ -176,7 +176,7 @@ public class NetworkEventBus this.objEvent = Event; } - public void invoke( final Object obj, final MENetworkEvent e ) throws NetworkEventDone + private void invoke( final Object obj, final MENetworkEvent e ) throws NetworkEventDone { try { @@ -198,17 +198,17 @@ public class NetworkEventBus } } - class MENetworkEventInfo + private class MENetworkEventInfo { private final List methods = new ArrayList(); - public void Add( final Class Event, final Class ObjClass, final Method ObjMethod ) + private void Add( final Class Event, final Class ObjClass, final Method ObjMethod ) { this.methods.add( new EventMethod( Event, ObjClass, ObjMethod ) ); } - public void invoke( final Object obj, final MENetworkEvent e ) throws NetworkEventDone + private void invoke( final Object obj, final MENetworkEvent e ) throws NetworkEventDone { for( final EventMethod em : this.methods ) { diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index c1a9163e..e5b3883d 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -89,8 +89,8 @@ import appeng.util.ItemSorters; public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { - public static final ExecutorService CRAFTING_POOL; - static final Comparator COMPARATOR = new Comparator() + private static final ExecutorService CRAFTING_POOL; + private static final Comparator COMPARATOR = new Comparator() { @Override public int compare( final ICraftingPatternDetails firstDetail, final ICraftingPatternDetails nextDetail ) @@ -123,7 +123,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper private final Set emitableItems = new HashSet(); private final Map craftingLinks = new HashMap(); private final Multimap interests = HashMultimap.create(); - public final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); + private final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); private IStorageGrid storageGrid; private IEnergyGrid energyGrid; private boolean updateList = false; @@ -616,7 +616,12 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper return this.craftingCPUClusters.contains( cpu ); } - static class ActiveCpuIterator implements Iterator + public GenericInterestManager getInterestManager() + { + return this.interestManager; + } + + private static class ActiveCpuIterator implements Iterator { private final Iterator iterator; diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index cfc058f4..2198908e 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -58,42 +58,42 @@ import appeng.me.energy.EnergyWatcher; public class EnergyGridCache implements IEnergyGrid { - public final TreeSet interests = new TreeSet(); - final double AvgLength = 40.0; - final Set providers = new LinkedHashSet(); - final Set requesters = new LinkedHashSet(); - final Multiset energyGridProviders = HashMultiset.create(); - final IGrid myGrid; + private final TreeSet interests = new TreeSet(); + private final double AvgLength = 40.0; + private final Set providers = new LinkedHashSet(); + private final Set requesters = new LinkedHashSet(); + private final Multiset energyGridProviders = HashMultiset.create(); + private final IGrid myGrid; private final HashMap watchers = new HashMap(); private final Set localSeen = new HashSet(); /** * estimated power available. */ - int availableTicksSinceUpdate = 0; - double globalAvailablePower = 0; - double globalMaxPower = 0; + private int availableTicksSinceUpdate = 0; + private double globalAvailablePower = 0; + private double globalMaxPower = 0; /** * idle draw. */ - double drainPerTick = 0; - double avgDrainPerTick = 0; - double avgInjectionPerTick = 0; - double tickDrainPerTick = 0; - double tickInjectionPerTick = 0; + private double drainPerTick = 0; + private double avgDrainPerTick = 0; + private double avgInjectionPerTick = 0; + private double tickDrainPerTick = 0; + private double tickInjectionPerTick = 0; /** * power status */ - boolean publicHasPower = false; - boolean hasPower = true; - long ticksSinceHasPowerChange = 900; + private boolean publicHasPower = false; + private boolean hasPower = true; + private long ticksSinceHasPowerChange = 900; /** * excess power in the system. */ - double extra = 0; - IAEPowerStorage lastProvider; - IAEPowerStorage lastRequester; - PathGridCache pgc; - double lastStoredPower = -1; + private double extra = 0; + private IAEPowerStorage lastProvider; + private IAEPowerStorage lastRequester; + private PathGridCache pgc; + private double lastStoredPower = -1; public EnergyGridCache( final IGrid g ) { @@ -114,8 +114,8 @@ public class EnergyGridCache implements IEnergyGrid final IGridBlock gb = node.getGridBlock(); final double newDraw = gb.getIdlePowerUsage(); - final double diffDraw = newDraw - node.previousDraw; - node.previousDraw = newDraw; + final double diffDraw = newDraw - node.getPreviousDraw(); + node.setPreviousDraw( newDraw ); this.drainPerTick += diffDraw; } @@ -150,16 +150,16 @@ public class EnergyGridCache implements IEnergyGrid @Override public void onUpdateTick() { - if( !this.interests.isEmpty() ) + if( !this.getInterests().isEmpty() ) { final double oldPower = this.lastStoredPower; this.lastStoredPower = this.getStoredPower(); final EnergyThreshold low = new EnergyThreshold( Math.min( oldPower, this.lastStoredPower ), null ); final EnergyThreshold high = new EnergyThreshold( Math.max( oldPower, this.lastStoredPower ), null ); - for( final EnergyThreshold th : this.interests.subSet( low, true, high, true ) ) + for( final EnergyThreshold th : this.getInterests().subSet( low, true, high, true ) ) { - ( (EnergyWatcher) th.watcher ).post( this ); + ( (EnergyWatcher) th.getWatcher() ).post( this ); } } @@ -221,7 +221,7 @@ public class EnergyGridCache implements IEnergyGrid @Override public double getIdlePowerUsage() { - return this.drainPerTick + this.pgc.channelPowerUsage; + return this.drainPerTick + this.pgc.getChannelPowerUsage(); } private void publicPowerState( final boolean newState, final IGrid grid ) @@ -239,7 +239,7 @@ public class EnergyGridCache implements IEnergyGrid /** * refresh current stored power. */ - public void refreshPower() + private void refreshPower() { this.availableTicksSinceUpdate = 0; this.globalAvailablePower = 0; @@ -520,7 +520,7 @@ public class EnergyGridCache implements IEnergyGrid // idle draw. final GridNode gridNode = (GridNode) node; - this.drainPerTick -= gridNode.previousDraw; + this.drainPerTick -= gridNode.getPreviousDraw(); // power storage. if( machine instanceof IAEPowerStorage ) @@ -571,8 +571,8 @@ public class EnergyGridCache implements IEnergyGrid // idle draw... final GridNode gridNode = (GridNode) node; final IGridBlock gb = gridNode.getGridBlock(); - gridNode.previousDraw = gb.getIdlePowerUsage(); - this.drainPerTick += gridNode.previousDraw; + gridNode.setPreviousDraw( gb.getIdlePowerUsage() ); + this.drainPerTick += gridNode.getPreviousDraw(); // power storage if( machine instanceof IAEPowerStorage ) @@ -630,4 +630,9 @@ public class EnergyGridCache implements IEnergyGrid { storage.dataObject().setDouble( "extraEnergy", this.extra ); } + + public TreeSet getInterests() + { + return this.interests; + } } diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 666ad9c5..1b6bc3e4 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -58,11 +58,11 @@ import appeng.me.storage.NetworkInventoryHandler; public class GridStorageCache implements IStorageGrid { - public final IGrid myGrid; - final HashSet activeCellProviders = new HashSet(); - final HashSet inactiveCellProviders = new HashSet(); + private final IGrid myGrid; + private final HashSet activeCellProviders = new HashSet(); + private final HashSet inactiveCellProviders = new HashSet(); private final SetMultimap interests = HashMultimap.create(); - public final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); + private final GenericInterestManager interestManager = new GenericInterestManager( this.interests ); private final NetworkMonitor itemMonitor = new NetworkMonitor( this, StorageChannel.ITEMS ); private final NetworkMonitor fluidMonitor = new NetworkMonitor( this, StorageChannel.FLUIDS ); private final HashMap watchers = new HashMap(); @@ -88,7 +88,7 @@ public class GridStorageCache implements IStorageGrid { final ICellContainer cc = (ICellContainer) machine; - this.myGrid.postEvent( new MENetworkCellArrayUpdate() ); + this.getGrid().postEvent( new MENetworkCellArrayUpdate() ); this.removeCellProvider( cc, new CellChangeTracker() ).applyChanges(); this.inactiveCellProviders.remove( cc ); } @@ -112,7 +112,7 @@ public class GridStorageCache implements IStorageGrid final ICellContainer cc = (ICellContainer) machine; this.inactiveCellProviders.add( cc ); - this.myGrid.postEvent( new MENetworkCellArrayUpdate() ); + this.getGrid().postEvent( new MENetworkCellArrayUpdate() ); if( node.isActive() ) { this.addCellProvider( cc, new CellChangeTracker() ).applyChanges(); @@ -146,7 +146,7 @@ public class GridStorageCache implements IStorageGrid } - public CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker ) + private CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker ) { if( this.inactiveCellProviders.contains( cc ) ) { @@ -173,7 +173,7 @@ public class GridStorageCache implements IStorageGrid return tracker; } - public CellChangeTracker removeCellProvider( final ICellProvider cc, final CellChangeTracker tracker ) + private CellChangeTracker removeCellProvider( final ICellProvider cc, final CellChangeTracker tracker ) { if( this.activeCellProviders.contains( cc ) ) { @@ -259,7 +259,7 @@ public class GridStorageCache implements IStorageGrid } } - public IMEInventoryHandler getItemInventoryHandler() + IMEInventoryHandler getItemInventoryHandler() { if( this.myItemNetwork == null ) { @@ -270,7 +270,7 @@ public class GridStorageCache implements IStorageGrid private void buildNetworkStorage( final StorageChannel chan ) { - final SecurityCache security = this.myGrid.getCache( ISecurityGrid.class ); + final SecurityCache security = this.getGrid().getCache( ISecurityGrid.class ); switch( chan ) { @@ -298,7 +298,7 @@ public class GridStorageCache implements IStorageGrid } } - public IMEInventoryHandler getFluidInventoryHandler() + IMEInventoryHandler getFluidInventoryHandler() { if( this.myFluidNetwork == null ) { @@ -346,6 +346,16 @@ public class GridStorageCache implements IStorageGrid return this.fluidMonitor; } + public GenericInterestManager getInterestManager() + { + return this.interestManager; + } + + IGrid getGrid() + { + return this.myGrid; + } + private class CellChangeTrackerRecord { diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 8b0c1cd4..d61fca35 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -42,7 +42,7 @@ public class NetworkMonitor> extends MEMonitorHandler private static final Deque> DEPTH = new LinkedList>(); private final GridStorageCache myGridCache; private final StorageChannel myChannel; - boolean sendEvent = false; + private boolean sendEvent = false; public NetworkMonitor( final GridStorageCache cache, final StorageChannel chan ) { @@ -51,7 +51,7 @@ public class NetworkMonitor> extends MEMonitorHandler this.myChannel = chan; } - public void forceUpdate() + void forceUpdate() { this.hasChanged = true; @@ -72,12 +72,12 @@ public class NetworkMonitor> extends MEMonitorHandler } } - public void onTick() + void onTick() { if( this.sendEvent ) { this.sendEvent = false; - this.myGridCache.myGrid.postEvent( new MENetworkStorageEvent( this, this.myChannel ) ); + this.myGridCache.getGrid().postEvent( new MENetworkStorageEvent( this, this.myChannel ) ); } } @@ -124,9 +124,9 @@ public class NetworkMonitor> extends MEMonitorHandler ( difference = changedItem.copy() ).setStackSize( -changedItem.getStackSize() ); } - if( this.myGridCache.interestManager.containsKey( changedItem ) ) + if( this.myGridCache.getInterestManager().containsKey( changedItem ) ) { - final Collection list = this.myGridCache.interestManager.get( changedItem ); + final Collection list = this.myGridCache.getInterestManager().get( changedItem ); if( !list.isEmpty() ) { IAEStack fullStack = myStorageList.findPrecise( changedItem ); @@ -136,14 +136,14 @@ public class NetworkMonitor> extends MEMonitorHandler fullStack.setStackSize( 0 ); } - this.myGridCache.interestManager.enableTransactions(); + this.myGridCache.getInterestManager().enableTransactions(); for( final ItemWatcher iw : list ) { iw.getHost().onStackChange( myStorageList, fullStack, difference, src, this.getChannel() ); } - this.myGridCache.interestManager.disableTransactions(); + this.myGridCache.getInterestManager().disableTransactions(); } } } diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index caae09a5..43fe5c12 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -42,7 +42,7 @@ import appeng.parts.p2p.PartP2PTunnelME; public class P2PCache implements IGridCache { - final IGrid myGrid; + private final IGrid myGrid; private final HashMap inputs = new HashMap(); private final Multimap outputs = LinkedHashMultimap.create(); private final TunnelCollection NullColl = new TunnelCollection( null, null ); @@ -101,16 +101,16 @@ public class P2PCache implements IGridCache // AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq // ); - if( t.output ) + if( t.isOutput() ) { - this.outputs.remove( t.freq, t ); + this.outputs.remove( t.getFrequency(), t ); } else { - this.inputs.remove( t.freq ); + this.inputs.remove( t.getFrequency() ); } - this.updateTunnel( t.freq, !t.output, false ); + this.updateTunnel( t.getFrequency(), !t.isOutput(), false ); } } @@ -131,16 +131,16 @@ public class P2PCache implements IGridCache // AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq // ); - if( t.output ) + if( t.isOutput() ) { - this.outputs.put( t.freq, t ); + this.outputs.put( t.getFrequency(), t ); } else { - this.inputs.put( t.freq, t ); + this.inputs.put( t.getFrequency(), t ); } - this.updateTunnel( t.freq, !t.output, false ); + this.updateTunnel( t.getFrequency(), !t.isOutput(), false ); } } @@ -188,29 +188,29 @@ public class P2PCache implements IGridCache { if( this.outputs.containsValue( t ) ) { - this.outputs.remove( t.freq, t ); + this.outputs.remove( t.getFrequency(), t ); } if( this.inputs.containsValue( t ) ) { - this.inputs.remove( t.freq ); + this.inputs.remove( t.getFrequency() ); } - t.freq = newFrequency; + t.setFrequency( newFrequency ); - if( t.output ) + if( t.isOutput() ) { - this.outputs.put( t.freq, t ); + this.outputs.put( t.getFrequency(), t ); } else { - this.inputs.put( t.freq, t ); + this.inputs.put( t.getFrequency(), t ); } // AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq // ); - this.updateTunnel( t.freq, t.output, true ); - this.updateTunnel( t.freq, !t.output, true ); + this.updateTunnel( t.getFrequency(), t.isOutput(), true ); + this.updateTunnel( t.getFrequency(), !t.isOutput(), true ); } public TunnelCollection getOutputs( final long freq, final Class c ) diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index b589d4d2..4ff34dd3 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -60,21 +60,20 @@ import appeng.util.Platform; public class PathGridCache implements IPathingGrid { - final LinkedList active = new LinkedList(); - final Set controllers = new HashSet(); - final Set requireChannels = new HashSet(); - final Set blockDense = new HashSet(); - final IGrid myGrid; - public int channelsInUse = 0; - public int channelsByBlocks = 0; - public double channelPowerUsage = 0.0; - boolean recalculateControllerNextTick = true; - boolean updateNetwork = true; - boolean booting = false; - ControllerState controllerState = ControllerState.NO_CONTROLLER; - int instance = Integer.MIN_VALUE; - int ticksUntilReady = 20; - int lastChannels = 0; + private final LinkedList active = new LinkedList(); + private final Set controllers = new HashSet(); + private final Set requireChannels = new HashSet(); + private final Set blockDense = new HashSet(); + private final IGrid myGrid; + private int channelsInUse = 0; + private int channelsByBlocks = 0; + private double channelPowerUsage = 0.0; + private boolean recalculateControllerNextTick = true; + private boolean updateNetwork = true; + private boolean booting = false; + private ControllerState controllerState = ControllerState.NO_CONTROLLER; + private int ticksUntilReady = 20; + private int lastChannels = 0; private HashSet semiOpen = new HashSet(); public PathGridCache( final IGrid g ) @@ -99,8 +98,7 @@ public class PathGridCache implements IPathingGrid this.booting = true; this.updateNetwork = false; - this.instance++; - this.channelsInUse = 0; + this.setChannelsInUse( 0 ); if( !AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) { @@ -108,8 +106,8 @@ public class PathGridCache implements IPathingGrid final int nodes = this.myGrid.getNodes().size(); this.ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); - this.channelsByBlocks = nodes * used; - this.channelPowerUsage = this.channelsByBlocks / 128.0; + this.setChannelsByBlocks( nodes * used ); + this.setChannelPowerUsage( this.getChannelsByBlocks() / 128.0 ); this.myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) ); } @@ -123,11 +121,11 @@ public class PathGridCache implements IPathingGrid } final int nodes = this.myGrid.getNodes().size(); - this.channelsInUse = used; + this.setChannelsInUse( used ); this.ticksUntilReady = 20 + Math.max( 0, nodes / 100 - 20 ); - this.channelsByBlocks = nodes * used; - this.channelPowerUsage = this.channelsByBlocks / 128.0; + this.setChannelsByBlocks( nodes * used ); + this.setChannelPowerUsage( this.getChannelsByBlocks() / 128.0 ); this.myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) ); } @@ -172,7 +170,7 @@ public class PathGridCache implements IPathingGrid final PathSegment pat = i.next(); if( pat.step() ) { - pat.isDead = true; + pat.setDead( true ); i.remove(); } } @@ -195,7 +193,7 @@ public class PathGridCache implements IPathingGrid this.achievementPost(); this.booting = false; - this.channelPowerUsage = this.channelsByBlocks / 128.0; + this.setChannelPowerUsage( this.getChannelsByBlocks() / 128.0 ); this.myGrid.postEvent( new MENetworkBootingStatusChange() ); } } @@ -290,7 +288,7 @@ public class PathGridCache implements IPathingGrid startingNode.beginVisit( cv ); - if( cv.isValid && cv.found == this.controllers.size() ) + if( cv.isValid() && cv.getFound() == this.controllers.size() ) { this.controllerState = ControllerState.CONTROLLER_ONLINE; } @@ -342,9 +340,9 @@ public class PathGridCache implements IPathingGrid private void achievementPost() { - if( this.lastChannels != this.channelsInUse && AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) + if( this.lastChannels != this.getChannelsInUse() && AEConfig.instance.isFeatureEnabled( AEFeature.Channels ) ) { - final Achievements currentBracket = this.getAchievementBracket( this.channelsInUse ); + final Achievements currentBracket = this.getAchievementBracket( this.getChannelsInUse() ); final Achievements lastBracket = this.getAchievementBracket( this.lastChannels ); if( currentBracket != lastBracket && currentBracket != null ) { @@ -360,7 +358,7 @@ public class PathGridCache implements IPathingGrid } } } - this.lastChannels = this.channelsInUse; + this.lastChannels = this.getChannelsInUse(); } private Achievements getAchievementBracket( final int ch ) @@ -418,7 +416,37 @@ public class PathGridCache implements IPathingGrid // clean up... this.active.clear(); - this.channelsByBlocks = 0; + this.setChannelsByBlocks( 0 ); this.updateNetwork = true; } + + double getChannelPowerUsage() + { + return this.channelPowerUsage; + } + + private void setChannelPowerUsage( final double channelPowerUsage ) + { + this.channelPowerUsage = channelPowerUsage; + } + + public int getChannelsByBlocks() + { + return this.channelsByBlocks; + } + + public void setChannelsByBlocks( final int channelsByBlocks ) + { + this.channelsByBlocks = channelsByBlocks; + } + + public int getChannelsInUse() + { + return this.channelsInUse; + } + + public void setChannelsInUse( final int channelsInUse ) + { + this.channelsInUse = channelsInUse; + } } diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 3bc0b1df..4dcb911e 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -45,7 +45,7 @@ import appeng.me.GridNode; public class SecurityCache implements ISecurityGrid { - public final IGrid myGrid; + private final IGrid myGrid; private final List securityProvider = new ArrayList(); private final HashMap> playerPerms = new HashMap>(); private long securityKey = -1; @@ -103,10 +103,10 @@ public class SecurityCache implements ISecurityGrid if( lastCode != this.securityKey ) { - this.myGrid.postEvent( new MENetworkSecurityChange() ); - for( final IGridNode n : this.myGrid.getNodes() ) + this.getGrid().postEvent( new MENetworkSecurityChange() ); + for( final IGridNode n : this.getGrid().getNodes() ) { - ( (GridNode) n ).lastSecurityKey = this.securityKey; + ( (GridNode) n ).setLastSecurityKey( this.securityKey ); } } } @@ -121,7 +121,7 @@ public class SecurityCache implements ISecurityGrid } else { - ( (GridNode) gridNode ).lastSecurityKey = this.securityKey; + ( (GridNode) gridNode ).setLastSecurityKey( this.securityKey ); } } @@ -194,4 +194,9 @@ public class SecurityCache implements ISecurityGrid } return -1; } + + public IGrid getGrid() + { + return this.myGrid; + } } diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index 564eb8eb..61e25f0d 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -41,15 +41,14 @@ import appeng.tile.spatial.TileSpatialPylon; public class SpatialPylonCache implements ISpatialCache { - final IGrid myGrid; - long powerRequired = 0; - double efficiency = 0.0; - DimensionalCoord captureMin; - DimensionalCoord captureMax; - boolean isValid = false; - List ioPorts = new LinkedList(); - HashMap clusters = new HashMap(); - boolean needsUpdate = false; + private final IGrid myGrid; + private long powerRequired = 0; + private double efficiency = 0.0; + private DimensionalCoord captureMin; + private DimensionalCoord captureMax; + private boolean isValid = false; + private List ioPorts = new LinkedList(); + private HashMap clusters = new HashMap(); public SpatialPylonCache( final IGrid g ) { @@ -62,7 +61,7 @@ public class SpatialPylonCache implements ISpatialCache this.reset( this.myGrid ); } - public void reset( final IGrid grid ) + private void reset( final IGrid grid ) { this.clusters = new HashMap(); @@ -95,22 +94,22 @@ public class SpatialPylonCache implements ISpatialCache { if( this.captureMax == null ) { - this.captureMax = cl.max.copy(); + this.captureMax = cl.getMax().copy(); } if( this.captureMin == null ) { - this.captureMin = cl.min.copy(); + this.captureMin = cl.getMin().copy(); } pylonBlocks += cl.tileCount(); - this.captureMin.x = Math.min( this.captureMin.x, cl.min.x ); - this.captureMin.y = Math.min( this.captureMin.y, cl.min.y ); - this.captureMin.z = Math.min( this.captureMin.z, cl.min.z ); + this.captureMin.x = Math.min( this.captureMin.x, cl.getMin().x ); + this.captureMin.y = Math.min( this.captureMin.y, cl.getMin().y ); + this.captureMin.z = Math.min( this.captureMin.z, cl.getMin().z ); - this.captureMax.x = Math.max( this.captureMax.x, cl.max.x ); - this.captureMax.y = Math.max( this.captureMax.y, cl.max.y ); - this.captureMax.z = Math.max( this.captureMax.z, cl.max.z ); + this.captureMax.x = Math.max( this.captureMax.x, cl.getMax().x ); + this.captureMax.y = Math.max( this.captureMax.y, cl.getMax().y ); + this.captureMax.z = Math.max( this.captureMax.z, cl.getMax().z ); } double maxPower = 0; @@ -121,21 +120,21 @@ public class SpatialPylonCache implements ISpatialCache for( final SpatialPylonCluster cl : this.clusters.values() ) { - switch( cl.currentAxis ) + switch( cl.getCurrentAxis() ) { case X: - this.isValid = this.isValid && ( ( this.captureMax.y == cl.min.y || this.captureMin.y == cl.max.y ) || ( this.captureMax.z == cl.min.z || this.captureMin.z == cl.max.z ) ) && ( ( this.captureMax.y == cl.max.y || this.captureMin.y == cl.min.y ) || ( this.captureMax.z == cl.max.z || this.captureMin.z == cl.min.z ) ); + this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); break; case Y: - this.isValid = this.isValid && ( ( this.captureMax.x == cl.min.x || this.captureMin.x == cl.max.x ) || ( this.captureMax.z == cl.min.z || this.captureMin.z == cl.max.z ) ) && ( ( this.captureMax.x == cl.max.x || this.captureMin.x == cl.min.x ) || ( this.captureMax.z == cl.max.z || this.captureMin.z == cl.min.z ) ); + this.isValid = this.isValid && ( ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x ) || ( this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z ) ) && ( ( this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x ) || ( this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z ) ); break; case Z: - this.isValid = this.isValid && ( ( this.captureMax.y == cl.min.y || this.captureMin.y == cl.max.y ) || ( this.captureMax.x == cl.min.x || this.captureMin.x == cl.max.x ) ) && ( ( this.captureMax.y == cl.max.y || this.captureMin.y == cl.min.y ) || ( this.captureMax.x == cl.max.x || this.captureMin.x == cl.min.x ) ); + this.isValid = this.isValid && ( ( this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y ) || ( this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x ) ) && ( ( this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y ) || ( this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x ) ); break; case UNFORMED: @@ -169,8 +168,8 @@ public class SpatialPylonCache implements ISpatialCache for( final SpatialPylonCluster cl : this.clusters.values() ) { - final boolean myWasValid = cl.isValid; - cl.isValid = this.isValid; + final boolean myWasValid = cl.isValid(); + cl.setValid( this.isValid ); if( myWasValid != this.isValid ) { cl.updateStatus( false ); diff --git a/src/main/java/appeng/me/cache/TickManagerCache.java b/src/main/java/appeng/me/cache/TickManagerCache.java index ab291c83..4740a9a6 100644 --- a/src/main/java/appeng/me/cache/TickManagerCache.java +++ b/src/main/java/appeng/me/cache/TickManagerCache.java @@ -40,11 +40,11 @@ import appeng.me.cache.helpers.TickTracker; public class TickManagerCache implements ITickManager { - final IGrid myGrid; - final HashMap alertable = new HashMap(); - final HashMap sleeping = new HashMap(); - final HashMap awake = new HashMap(); - final PriorityQueue upcomingTicks = new PriorityQueue(); + private final IGrid myGrid; + private final HashMap alertable = new HashMap(); + private final HashMap sleeping = new HashMap(); + private final HashMap awake = new HashMap(); + private final PriorityQueue upcomingTicks = new PriorityQueue(); private long currentTick = 0; public TickManagerCache( final IGrid g ) @@ -84,28 +84,28 @@ public class TickManagerCache implements ITickManager while( !this.upcomingTicks.isEmpty() ) { tt = this.upcomingTicks.peek(); - final int diff = (int) ( this.currentTick - tt.lastTick ); - if( diff >= tt.current_rate ) + final int diff = (int) ( this.currentTick - tt.getLastTick() ); + if( diff >= tt.getCurrentRate() ) { // remove tt.. this.upcomingTicks.poll(); - final TickRateModulation mod = tt.gt.tickingRequest( tt.node, diff ); + final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff ); switch( mod ) { case FASTER: - tt.setRate( tt.current_rate - 2 ); + tt.setRate( tt.getCurrentRate() - 2 ); break; case IDLE: - tt.setRate( tt.request.maxTickRate ); + tt.setRate( tt.getRequest().maxTickRate ); break; case SAME: break; case SLEEP: - this.sleepDevice( tt.node ); + this.sleepDevice( tt.getNode() ); break; case SLOWER: - tt.setRate( tt.current_rate + 1 ); + tt.setRate( tt.getCurrentRate() + 1 ); break; case URGENT: tt.setRate( 0 ); @@ -114,7 +114,7 @@ public class TickManagerCache implements ITickManager break; } - if( this.awake.containsKey( tt.node ) ) + if( this.awake.containsKey( tt.getNode() ) ) { this.addToQueue( tt ); } @@ -128,7 +128,7 @@ public class TickManagerCache implements ITickManager catch( final Throwable t ) { final CrashReport crashreport = CrashReport.makeCrashReport( t, "Ticking GridNode" ); - final CrashReportCategory crashreportcategory = crashreport.makeCategory( tt.gt.getClass().getSimpleName() + " being ticked." ); + final CrashReportCategory crashreportcategory = crashreport.makeCategory( tt.getGridTickable().getClass().getSimpleName() + " being ticked." ); tt.addEntityCrashInfo( crashreportcategory ); throw new ReportedException( crashreport ); } @@ -136,7 +136,7 @@ public class TickManagerCache implements ITickManager private void addToQueue( final TickTracker tt ) { - tt.lastTick = this.currentTick; + tt.setLastTick( this.currentTick ); this.upcomingTicks.add( tt ); } @@ -213,8 +213,8 @@ public class TickManagerCache implements ITickManager this.awake.put( node, tt ); // configure sort. - tt.lastTick -= tt.request.maxTickRate; - tt.current_rate = tt.request.minTickRate; + tt.setLastTick( tt.getLastTick() - tt.getRequest().maxTickRate ); + tt.setCurrentRate( tt.getRequest().minTickRate ); // prevent dupes and tick build up. this.upcomingTicks.remove( tt ); diff --git a/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java b/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java index 514f50fc..759a9408 100644 --- a/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java +++ b/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java @@ -25,10 +25,20 @@ import appeng.api.networking.IGridConnection; public class ConnectionWrapper { - public IGridConnection connection; + private IGridConnection connection; public ConnectionWrapper( final IGridConnection gc ) { - this.connection = gc; + this.setConnection( gc ); + } + + public IGridConnection getConnection() + { + return this.connection; + } + + public void setConnection( final IGridConnection connection ) + { + this.connection = connection; } } \ No newline at end of file diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 02f7846c..5ea373d8 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -31,10 +31,10 @@ import appeng.util.IWorldCallable; public class Connections implements IWorldCallable { - public final HashMap connections = new HashMap(); + private final HashMap connections = new HashMap(); private final PartP2PTunnelME me; - public boolean create = false; - public boolean destroy = false; + private boolean create = false; + private boolean destroy = false; public Connections( final PartP2PTunnelME o ) { @@ -51,13 +51,38 @@ public class Connections implements IWorldCallable public void markDestroy() { - this.create = false; - this.destroy = true; + this.setCreate( false ); + this.setDestroy( true ); } public void markCreate() { - this.create = true; - this.destroy = false; + this.setCreate( true ); + this.setDestroy( false ); + } + + public HashMap getConnections() + { + return this.connections; + } + + public boolean isCreate() + { + return this.create; + } + + private void setCreate( final boolean create ) + { + this.create = create; + } + + public boolean isDestroy() + { + return this.destroy; + } + + private void setDestroy( final boolean destroy ) + { + this.destroy = destroy; } } diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index d7b40a22..0c4698df 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -34,23 +34,23 @@ import appeng.parts.AEBasePart; public class TickTracker implements Comparable { - public final TickingRequest request; - public final IGridTickable gt; - public final IGridNode node; - public final TickManagerCache host; + private final TickingRequest request; + private final IGridTickable gt; + private final IGridNode node; + private final TickManagerCache host; - public final long LastFiveTicksTime = 0; + private final long LastFiveTicksTime = 0; - public long lastTick; - public int current_rate; + private long lastTick; + private int currentRate; public TickTracker( final TickingRequest req, final IGridNode node, final IGridTickable gt, final long currentTick, final TickManagerCache tickManagerCache ) { this.request = req; this.gt = gt; this.node = node; - this.current_rate = ( req.minTickRate + req.maxTickRate ) / 2; - this.lastTick = currentTick; + this.setCurrentRate( ( req.minTickRate + req.maxTickRate ) / 2 ); + this.setLastTick( currentTick ); this.host = tickManagerCache; } @@ -61,46 +61,81 @@ public class TickTracker implements Comparable public void setRate( final int rate ) { - this.current_rate = rate; + this.setCurrentRate( rate ); - if( this.current_rate < this.request.minTickRate ) + if( this.getCurrentRate() < this.getRequest().minTickRate ) { - this.current_rate = this.request.minTickRate; + this.setCurrentRate( this.getRequest().minTickRate ); } - if( this.current_rate > this.request.maxTickRate ) + if( this.getCurrentRate() > this.getRequest().maxTickRate ) { - this.current_rate = this.request.maxTickRate; + this.setCurrentRate( this.getRequest().maxTickRate ); } } @Override public int compareTo( @Nonnull final TickTracker t ) { - final int nextTick = (int) ( ( this.lastTick - this.host.getCurrentTick() ) + this.current_rate ); - final int ts_nextTick = (int) ( ( t.lastTick - this.host.getCurrentTick() ) + t.current_rate ); + final int nextTick = (int) ( ( this.getLastTick() - this.host.getCurrentTick() ) + this.getCurrentRate() ); + final int ts_nextTick = (int) ( ( t.getLastTick() - this.host.getCurrentTick() ) + t.getCurrentRate() ); return nextTick - ts_nextTick; } public void addEntityCrashInfo( final CrashReportCategory crashreportcategory ) { - if( this.gt instanceof AEBasePart ) + if( this.getGridTickable() instanceof AEBasePart ) { - final AEBasePart part = (AEBasePart) this.gt; + final AEBasePart part = (AEBasePart) this.getGridTickable(); part.addEntityCrashInfo( crashreportcategory ); } - crashreportcategory.addCrashSection( "CurrentTickRate", this.current_rate ); - crashreportcategory.addCrashSection( "MinTickRate", this.request.minTickRate ); - crashreportcategory.addCrashSection( "MaxTickRate", this.request.maxTickRate ); - crashreportcategory.addCrashSection( "MachineType", this.gt.getClass().getName() ); - crashreportcategory.addCrashSection( "GridBlockType", this.node.getGridBlock().getClass().getName() ); - crashreportcategory.addCrashSection( "ConnectedSides", this.node.getConnectedSides() ); + crashreportcategory.addCrashSection( "CurrentTickRate", this.getCurrentRate() ); + crashreportcategory.addCrashSection( "MinTickRate", this.getRequest().minTickRate ); + crashreportcategory.addCrashSection( "MaxTickRate", this.getRequest().maxTickRate ); + crashreportcategory.addCrashSection( "MachineType", this.getGridTickable().getClass().getName() ); + crashreportcategory.addCrashSection( "GridBlockType", this.getNode().getGridBlock().getClass().getName() ); + crashreportcategory.addCrashSection( "ConnectedSides", this.getNode().getConnectedSides() ); - final DimensionalCoord dc = this.node.getGridBlock().getLocation(); + final DimensionalCoord dc = this.getNode().getGridBlock().getLocation(); if( dc != null ) { crashreportcategory.addCrashSection( "Location", dc ); } } + + public int getCurrentRate() + { + return this.currentRate; + } + + public void setCurrentRate( final int currentRate ) + { + this.currentRate = currentRate; + } + + public long getLastTick() + { + return this.lastTick; + } + + public void setLastTick( final long lastTick ) + { + this.lastTick = lastTick; + } + + public IGridNode getNode() + { + return this.node; + } + + public IGridTickable getGridTickable() + { + return this.gt; + } + + public TickingRequest getRequest() + { + return this.request; + } } diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java index 88763bbb..c0caad44 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -29,8 +29,8 @@ import appeng.util.iterators.NullIterator; public class TunnelCollection implements Iterable { - final Class clz; - Collection tunnelSources; + private final Class clz; + private Collection tunnelSources; public TunnelCollection( final Collection src, final Class c ) { diff --git a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java index 388ab370..b4abb1b3 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelConnection.java @@ -26,12 +26,22 @@ import appeng.parts.p2p.PartP2PTunnelME; public class TunnelConnection { - public final PartP2PTunnelME tunnel; - public final IGridConnection c; + private final PartP2PTunnelME tunnel; + private final IGridConnection c; public TunnelConnection( final PartP2PTunnelME t, final IGridConnection con ) { this.tunnel = t; this.c = con; } + + public IGridConnection getConnection() + { + return this.c; + } + + public PartP2PTunnelME getTunnel() + { + return this.tunnel; + } } \ No newline at end of file diff --git a/src/main/java/appeng/me/cache/helpers/TunnelIterator.java b/src/main/java/appeng/me/cache/helpers/TunnelIterator.java index bfe6a669..3e86f120 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelIterator.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelIterator.java @@ -28,9 +28,9 @@ import appeng.parts.p2p.PartP2PTunnel; public class TunnelIterator implements Iterator { - final Iterator wrapped; - final Class targetType; - T Next; + private final Iterator wrapped; + private final Class targetType; + private T Next; public TunnelIterator( final Collection tunnelSources, final Class clz ) { diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 029d8489..10c867cb 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -122,7 +122,7 @@ public abstract class MBCalculator this.disconnect(); } - public boolean isValidTileAt( final World w, final int x, final int y, final int z ) + private boolean isValidTileAt( final World w, final int x, final int y, final int z ) { return this.isValidTile( w.getTileEntity( x, y, z ) ); } @@ -137,7 +137,7 @@ public abstract class MBCalculator */ public abstract boolean checkMultiblockScale( WorldCoord min, WorldCoord max ); - public boolean verifyUnownedRegion( final World w, final WorldCoord min, final WorldCoord max ) + private boolean verifyUnownedRegion( final World w, final WorldCoord min, final WorldCoord max ) { for( final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS ) { @@ -187,7 +187,7 @@ public abstract class MBCalculator */ public abstract boolean isValidTile( TileEntity te ); - public boolean verifyUnownedRegionInner( final World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, final ForgeDirection side ) + private boolean verifyUnownedRegionInner( final World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, final ForgeDirection side ) { switch( side ) { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 60c8c582..dab55bfb 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -39,7 +39,7 @@ import appeng.tile.crafting.TileCraftingTile; public class CraftingCPUCalculator extends MBCalculator { - final TileCraftingTile tqb; + private final TileCraftingTile tqb; public CraftingCPUCalculator( final IAEMultiBlock t ) { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 9254e2f0..8f93eb83 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -196,14 +196,14 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU return (Iterator) this.tiles.iterator(); } - public void addTile( final TileCraftingTile te ) + void addTile( final TileCraftingTile te ) { - if( this.machineSrc == null || te.isCoreBlock ) + if( this.machineSrc == null || te.isCoreBlock() ) { this.machineSrc = new MachineSource( te ); } - te.isCoreBlock = false; + te.setCoreBlock( false ); te.markDirty(); this.tiles.push( te ); @@ -364,7 +364,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU return input; } - protected void postChange( final IAEItemStack diff, final BaseActionSource src ) + private void postChange( final IAEItemStack diff, final BaseActionSource src ) { final Iterator, Object>> i = this.getListeners(); @@ -396,7 +396,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU this.getCore().markDirty(); } - public void postCraftingStatusChange( final IAEItemStack diff ) + private void postCraftingStatusChange( final IAEItemStack diff ) { if( this.getGrid() == null ) { @@ -405,9 +405,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU final CraftingGridCache sg = this.getGrid().getCache( ICraftingGrid.class ); - if( sg.interestManager.containsKey( diff ) ) + if( sg.getInterestManager().containsKey( diff ) ) { - final Collection list = sg.interestManager.get( diff ); + final Collection list = sg.getInterestManager().get( diff ); if( !list.isEmpty() ) { @@ -450,7 +450,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU } } - protected Iterator, Object>> getListeners() + private Iterator, Object>> getListeners() { return this.listeners.entrySet().iterator(); } @@ -460,7 +460,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU return (TileCraftingTile) this.machineSrc.via; } - public IGrid getGrid() + private IGrid getGrid() { for( final TileCraftingTile r : this.tiles ) { @@ -855,7 +855,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU try { this.waitingFor.resetStatus(); - ( (CraftingJob) job ).tree.setJob( ci, this, src ); + ( (CraftingJob) job ).getTree().setJob( ci, this, src ); if( ci.commit( src ) ) { this.finalOutput = job.getOutput(); @@ -1161,16 +1161,16 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU return out; } - public void done() + void done() { final TileCraftingTile core = this.getCore(); - core.isCoreBlock = true; + core.setCoreBlock( true ); - if( core.previousState != null ) + if( core.getPreviousState() != null ) { - this.readFromNBT( core.previousState ); - core.previousState = null; + this.readFromNBT( core.getPreviousState() ); + core.setPreviousState( null ); } this.updateCPU(); @@ -1330,8 +1330,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU return this.startItemCount; } - static class TaskProgress + private static class TaskProgress { - long value; + private long value; } } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 73cf143c..95c3c9a0 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -139,13 +139,13 @@ public class QuantumCalculator extends MBCalculator { if( num == 1 || num == 3 || num == 7 || num == 9 ) { - flags = (byte) ( this.tqb.corner | num ); + flags = (byte) ( this.tqb.getCorner() | num ); } else { flags = num; } - c.Ring[ringNum] = te; + c.getRing()[ringNum] = te; ringNum++; } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index ce140f60..034fa116 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -48,13 +48,13 @@ import appeng.util.iterators.ChainedIterator; public class QuantumCluster implements ILocatable, IAECluster { - public final WorldCoord min; - public final WorldCoord max; - public boolean isDestroyed = false; - public boolean updateStatus = true; - public TileQuantumBridge[] Ring; - boolean registered = false; - ConnectionWrapper connection; + private final WorldCoord min; + private final WorldCoord max; + private boolean isDestroyed = false; + private boolean updateStatus = true; + private TileQuantumBridge[] Ring; + private boolean registered = false; + private ConnectionWrapper connection; private long thisSide; private long otherSide; private TileQuantumBridge center; @@ -63,7 +63,7 @@ public class QuantumCluster implements ILocatable, IAECluster { this.min = min; this.max = max; - this.Ring = new TileQuantumBridge[8]; + this.setRing( new TileQuantumBridge[8] ); } @SubscribeEvent @@ -71,7 +71,7 @@ public class QuantumCluster implements ILocatable, IAECluster { if( this.center.getWorldObj() == e.world ) { - this.updateStatus = false; + this.setUpdateStatus( false ); this.destroy(); } } @@ -123,10 +123,10 @@ public class QuantumCluster implements ILocatable, IAECluster if( sideA.isActive() && sideB.isActive() ) { - if( this.connection != null && this.connection.connection != null ) + if( this.connection != null && this.connection.getConnection() != null ) { - final IGridNode a = this.connection.connection.a(); - final IGridNode b = this.connection.connection.b(); + final IGridNode a = this.connection.getConnection().a(); + final IGridNode b = this.connection.getConnection().b(); final IGridNode sa = sideA.getNode(); final IGridNode sb = sideB.getNode(); if( ( a == sa || b == sa ) && ( a == sb || b == sb ) ) @@ -139,18 +139,18 @@ public class QuantumCluster implements ILocatable, IAECluster { if( sideA.connection != null ) { - if( sideA.connection.connection != null ) + if( sideA.connection.getConnection() != null ) { - sideA.connection.connection.destroy(); + sideA.connection.getConnection().destroy(); sideA.connection = new ConnectionWrapper( null ); } } if( sideB.connection != null ) { - if( sideB.connection.connection != null ) + if( sideB.connection.getConnection() != null ) { - sideB.connection.connection.destroy(); + sideB.connection.getConnection().destroy(); sideB.connection = new ConnectionWrapper( null ); } } @@ -174,16 +174,16 @@ public class QuantumCluster implements ILocatable, IAECluster if( shutdown && this.connection != null ) { - if( this.connection.connection != null ) + if( this.connection.getConnection() != null ) { - this.connection.connection.destroy(); - this.connection.connection = null; + this.connection.getConnection().destroy(); + this.connection.setConnection( null ); this.connection = new ConnectionWrapper( null ); } } } - public boolean canUseNode( final long qe ) + private boolean canUseNode( final long qe ) { final QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy( qe ); if( qc != null ) @@ -220,7 +220,7 @@ public class QuantumCluster implements ILocatable, IAECluster return this.center.getGridNode( ForgeDirection.UNKNOWN ); } - public boolean hasQES() + private boolean hasQES() { return this.thisSide != 0; } @@ -246,26 +246,26 @@ public class QuantumCluster implements ILocatable, IAECluster MinecraftForge.EVENT_BUS.post( new LocatableEventAnnounce( this, LocatableEvent.Unregister ) ); } - this.center.updateStatus( null, (byte) -1, this.updateStatus ); + this.center.updateStatus( null, (byte) -1, this.isUpdateStatus() ); - for( final TileQuantumBridge r : this.Ring ) + for( final TileQuantumBridge r : this.getRing() ) { - r.updateStatus( null, (byte) -1, this.updateStatus ); + r.updateStatus( null, (byte) -1, this.isUpdateStatus() ); } this.center = null; - this.Ring = new TileQuantumBridge[8]; + this.setRing( new TileQuantumBridge[8] ); } @Override public Iterator getTiles() { - return new ChainedIterator( this.Ring[0], this.Ring[1], this.Ring[2], this.Ring[3], this.Ring[4], this.Ring[5], this.Ring[6], this.Ring[7], this.center ); + return new ChainedIterator( this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center ); } public boolean isCorner( final TileQuantumBridge tileQuantumBridge ) { - return this.Ring[0] == tileQuantumBridge || this.Ring[2] == tileQuantumBridge || this.Ring[4] == tileQuantumBridge || this.Ring[6] == tileQuantumBridge; + return this.getRing()[0] == tileQuantumBridge || this.getRing()[2] == tileQuantumBridge || this.getRing()[4] == tileQuantumBridge || this.getRing()[6] == tileQuantumBridge; } @Override @@ -279,10 +279,30 @@ public class QuantumCluster implements ILocatable, IAECluster return this.center; } - public void setCenter( final TileQuantumBridge c ) + void setCenter( final TileQuantumBridge c ) { this.registered = true; MinecraftForge.EVENT_BUS.register( this ); this.center = c; } + + private boolean isUpdateStatus() + { + return this.updateStatus; + } + + public void setUpdateStatus( final boolean updateStatus ) + { + this.updateStatus = updateStatus; + } + + TileQuantumBridge[] getRing() + { + return this.Ring; + } + + private void setRing( final TileQuantumBridge[] ring ) + { + this.Ring = ring; + } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java index 3d0c0081..9d1df0da 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java @@ -95,7 +95,7 @@ public class SpatialPylonCalculator extends MBCalculator { final TileSpatialPylon te = (TileSpatialPylon) w.getTileEntity( x, y, z ); te.updateStatus( c ); - c.line.add( ( te ) ); + c.getLine().add( ( te ) ); } } } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index c33801d9..0febdeda 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -32,43 +32,41 @@ import appeng.tile.spatial.TileSpatialPylon; public class SpatialPylonCluster implements IAECluster { - public final DimensionalCoord min; - public final DimensionalCoord max; - final List line = new ArrayList(); - public boolean isDestroyed = false; + private final DimensionalCoord min; + private final DimensionalCoord max; + private final List line = new ArrayList(); + private boolean isDestroyed = false; - public Axis currentAxis = Axis.UNFORMED; - public boolean isValid; - public boolean hasPower; - public boolean hasChannel; + private Axis currentAxis = Axis.UNFORMED; + private boolean isValid; public SpatialPylonCluster( final DimensionalCoord min, final DimensionalCoord max ) { this.min = min.copy(); this.max = max.copy(); - if( this.min.x != this.max.x ) + if( this.getMin().x != this.getMax().x ) { - this.currentAxis = Axis.X; + this.setCurrentAxis( Axis.X ); } - else if( this.min.y != this.max.y ) + else if( this.getMin().y != this.getMax().y ) { - this.currentAxis = Axis.Y; + this.setCurrentAxis( Axis.Y ); } - else if( this.min.z != this.max.z ) + else if( this.getMin().z != this.getMax().z ) { - this.currentAxis = Axis.Z; + this.setCurrentAxis( Axis.Z ); } else { - this.currentAxis = Axis.UNFORMED; + this.setCurrentAxis( Axis.UNFORMED ); } } @Override public void updateStatus( final boolean updateGrid ) { - for( final TileSpatialPylon r : this.line ) + for( final TileSpatialPylon r : this.getLine() ) { r.recalculateDisplay(); } @@ -84,7 +82,7 @@ public class SpatialPylonCluster implements IAECluster } this.isDestroyed = true; - for( final TileSpatialPylon r : this.line ) + for( final TileSpatialPylon r : this.getLine() ) { r.updateStatus( null ); } @@ -93,12 +91,47 @@ public class SpatialPylonCluster implements IAECluster @Override public Iterator getTiles() { - return (Iterator) this.line.iterator(); + return (Iterator) this.getLine().iterator(); } public int tileCount() { - return this.line.size(); + return this.getLine().size(); + } + + public Axis getCurrentAxis() + { + return this.currentAxis; + } + + private void setCurrentAxis( final Axis currentAxis ) + { + this.currentAxis = currentAxis; + } + + public boolean isValid() + { + return this.isValid; + } + + public void setValid( final boolean isValid ) + { + this.isValid = isValid; + } + + public DimensionalCoord getMax() + { + return this.max; + } + + public DimensionalCoord getMin() + { + return this.min; + } + + List getLine() + { + return this.line; } public enum Axis diff --git a/src/main/java/appeng/me/energy/EnergyThreshold.java b/src/main/java/appeng/me/energy/EnergyThreshold.java index 13522fbe..3bf4d055 100644 --- a/src/main/java/appeng/me/energy/EnergyThreshold.java +++ b/src/main/java/appeng/me/energy/EnergyThreshold.java @@ -26,18 +26,18 @@ import appeng.util.ItemSorters; public class EnergyThreshold implements Comparable { - public final double Limit; - public final IEnergyWatcher watcher; - final int hash; + private final double Limit; + private final IEnergyWatcher watcher; + private final int hash; public EnergyThreshold( final double lim, final IEnergyWatcher wat ) { this.Limit = lim; this.watcher = wat; - if( this.watcher != null ) + if( this.getWatcher() != null ) { - this.hash = this.watcher.hashCode() ^ ( (Double) lim ).hashCode(); + this.hash = this.getWatcher().hashCode() ^ ( (Double) lim ).hashCode(); } else { @@ -54,6 +54,16 @@ public class EnergyThreshold implements Comparable @Override public int compareTo( final EnergyThreshold o ) { - return ItemSorters.compareDouble( this.Limit, o.Limit ); + return ItemSorters.compareDouble( this.getLimit(), o.getLimit() ); + } + + double getLimit() + { + return this.Limit; + } + + public IEnergyWatcher getWatcher() + { + return this.watcher; } } diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index c827279d..ed1ad9e6 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -34,9 +34,9 @@ import appeng.me.cache.EnergyGridCache; public class EnergyWatcher implements IEnergyWatcher { - final EnergyGridCache gsc; - final IEnergyWatcherHost myObject; - final HashSet myInterests = new HashSet(); + private final EnergyGridCache gsc; + private final IEnergyWatcherHost myObject; + private final HashSet myInterests = new HashSet(); public EnergyWatcher( final EnergyGridCache cache, final IEnergyWatcherHost host ) { @@ -99,14 +99,14 @@ public class EnergyWatcher implements IEnergyWatcher } final EnergyThreshold eh = new EnergyThreshold( e, this ); - return this.gsc.interests.add( eh ) && this.myInterests.add( eh ); + return this.gsc.getInterests().add( eh ) && this.myInterests.add( eh ); } @Override public boolean remove( final Object o ) { final EnergyThreshold eh = new EnergyThreshold( (Double) o, this ); - return this.myInterests.remove( eh ) && this.gsc.interests.remove( eh ); + return this.myInterests.remove( eh ) && this.gsc.getInterests().remove( eh ); } @Override @@ -163,17 +163,17 @@ public class EnergyWatcher implements IEnergyWatcher final Iterator i = this.myInterests.iterator(); while( i.hasNext() ) { - this.gsc.interests.remove( i.next() ); + this.gsc.getInterests().remove( i.next() ); i.remove(); } } - class EnergyWatcherIterator implements Iterator + private class EnergyWatcherIterator implements Iterator { - final EnergyWatcher watcher; - final Iterator interestIterator; - EnergyThreshold myLast; + private final EnergyWatcher watcher; + private final Iterator interestIterator; + private EnergyThreshold myLast; public EnergyWatcherIterator( final EnergyWatcher parent, final Iterator i ) { @@ -191,13 +191,13 @@ public class EnergyWatcher implements IEnergyWatcher public Double next() { this.myLast = this.interestIterator.next(); - return this.myLast.Limit; + return this.myLast.getLimit(); } @Override public void remove() { - EnergyWatcher.this.gsc.interests.remove( this.myLast ); + EnergyWatcher.this.gsc.getInterests().remove( this.myLast ); this.interestIterator.remove(); } } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 3f6c924d..d558ed3c 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -61,8 +61,8 @@ public class AENetworkProxy implements IGridBlock private final IGridProxyable gp; private final boolean worldNode; private final String nbtName; // name - public AEColor myColor = AEColor.Transparent; - NBTTagCompound data = null; // input + private AEColor myColor = AEColor.Transparent; + private NBTTagCompound data = null; // input private ItemStack myRepInstance; private boolean isReady = false; private IGridNode node = null; @@ -323,7 +323,7 @@ public class AENetworkProxy implements IGridBlock @Override public AEColor getGridColor() { - return this.myColor; + return this.getColor(); } @Override @@ -438,4 +438,14 @@ public class AENetworkProxy implements IGridBlock { this.owner = player; } + + public AEColor getColor() + { + return this.myColor; + } + + public void setColor( final AEColor myColor ) + { + this.myColor = myColor; + } } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java index 3123294b..f50a14dc 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java @@ -50,7 +50,7 @@ public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMul return new ProxyNodeIterator( this.getCluster().getTiles() ); } - IAECluster getCluster() + private IAECluster getCluster() { return ( (IAEMultiBlock) this.getMachine() ).getCluster(); } diff --git a/src/main/java/appeng/me/helpers/ChannelPowerSrc.java b/src/main/java/appeng/me/helpers/ChannelPowerSrc.java index 9bfff2b9..8ca76443 100644 --- a/src/main/java/appeng/me/helpers/ChannelPowerSrc.java +++ b/src/main/java/appeng/me/helpers/ChannelPowerSrc.java @@ -28,8 +28,8 @@ import appeng.api.networking.energy.IEnergySource; public class ChannelPowerSrc implements IEnergySource { - final IGridNode node; - final IEnergySource realSrc; + private final IGridNode node; + private final IEnergySource realSrc; public ChannelPowerSrc( final IGridNode networkNode, final IEnergySource src ) { diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index ea646930..21a9be40 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -108,12 +108,12 @@ public class GenericInterestManager return this.container.get( stack ); } - class SavedTransactions + private class SavedTransactions { - public final boolean put; - public final IAEStack stack; - public final T iw; + private final boolean put; + private final IAEStack stack; + private final T iw; public SavedTransactions( final boolean putOperation, final IAEStack myStack, final T watcher ) { diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index a02705c8..7b7cb4c0 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -28,14 +28,14 @@ import appeng.tile.networking.TileController; public class ControllerValidator implements IGridVisitor { - public boolean isValid = true; - public int found = 0; - int minX; - int minY; - int minZ; - int maxX; - int maxY; - int maxZ; + private boolean isValid = true; + private int found = 0; + private int minX; + private int minY; + private int minZ; + private int maxX; + private int maxY; + private int maxZ; public ControllerValidator( final int x, final int y, final int z ) { @@ -51,7 +51,7 @@ public class ControllerValidator implements IGridVisitor public boolean visitNode( final IGridNode n ) { final IGridHost host = n.getMachine(); - if( this.isValid && host instanceof TileController ) + if( this.isValid() && host instanceof TileController ) { final TileController c = (TileController) host; @@ -64,17 +64,37 @@ public class ControllerValidator implements IGridVisitor if( this.maxX - this.minX < 7 && this.maxY - this.minY < 7 && this.maxZ - this.minZ < 7 ) { - this.found++; + this.setFound( this.getFound() + 1 ); return true; } - this.isValid = false; + this.setValid( false ); } else { return false; } + return this.isValid(); + } + + public boolean isValid() + { return this.isValid; } + + private void setValid( final boolean isValid ) + { + this.isValid = isValid; + } + + public int getFound() + { + return this.found; + } + + private void setFound( final int found ) + { + this.found = found; + } } diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index 1c38ba59..f4c78683 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -34,11 +34,11 @@ import appeng.me.cache.PathGridCache; public class PathSegment { - final PathGridCache pgc; - final Set semiOpen; - final Set closed; - public boolean isDead; - List open; + private final PathGridCache pgc; + private final Set semiOpen; + private final Set closed; + private boolean isDead; + private List open; public PathSegment( final PathGridCache myPGC, final List open, final Set semiOpen, final Set closed ) { @@ -46,7 +46,7 @@ public class PathSegment this.semiOpen = semiOpen; this.closed = closed; this.pgc = myPGC; - this.isDead = false; + this.setDead( false ); } public boolean step() @@ -125,12 +125,12 @@ public class PathSegment pi = start; while( pi != null ) { - this.pgc.channelsByBlocks++; + this.pgc.setChannelsByBlocks( this.pgc.getChannelsByBlocks() + 1 ); pi.incrementChannelCount( 1 ); pi = pi.getControllerRoute(); } - this.pgc.channelsInUse++; + this.pgc.setChannelsInUse( this.pgc.getChannelsInUse() + 1 ); return true; } @@ -150,12 +150,22 @@ public class PathSegment pi = start; while( pi != null ) { - this.pgc.channelsByBlocks++; + this.pgc.setChannelsByBlocks( this.pgc.getChannelsByBlocks() + 1 ); pi.incrementChannelCount( 1 ); pi = pi.getControllerRoute(); } - this.pgc.channelsInUse++; + this.pgc.setChannelsInUse( this.pgc.getChannelsInUse() + 1 ); return true; } + + public boolean isDead() + { + return this.isDead; + } + + public void setDead( final boolean isDead ) + { + this.isDead = isDead; + } } diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index 0cbd9456..7ee587bd 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -62,7 +62,7 @@ public class CellInventory implements ICellInventory private short storedItems = 0; private int storedItemCount = 0; private IItemList cellItems; - private ItemStack cellItem; + private final ItemStack cellItem; private IStorageCell cellType; private CellInventory( final ItemStack o, final ISaveProvider container ) throws AppEngException @@ -179,7 +179,7 @@ public class CellInventory implements ICellInventory BLACK_LIST.add( ( meta << Platform.DEF_OFFSET ) | itemID ); } - public static boolean isBlackListed( final IAEItemStack input ) + private static boolean isBlackListed( final IAEItemStack input ) { if( BLACK_LIST.contains( ( OreDictionary.WILDCARD_VALUE << Platform.DEF_OFFSET ) | Item.getIdFromItem( input.getItem() ) ) ) { diff --git a/src/main/java/appeng/me/storage/CellInventoryHandler.java b/src/main/java/appeng/me/storage/CellInventoryHandler.java index a27fa55f..dbe8cc38 100644 --- a/src/main/java/appeng/me/storage/CellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/CellInventoryHandler.java @@ -108,7 +108,7 @@ public class CellInventoryHandler extends MEInventoryHandler imple @Override public ICellInventory getCellInv() { - Object o = this.internal; + Object o = this.getInternal(); if( o instanceof MEPassThrough ) { diff --git a/src/main/java/appeng/me/storage/CreativeCellInventory.java b/src/main/java/appeng/me/storage/CreativeCellInventory.java index 121c4ba1..54a0ca97 100644 --- a/src/main/java/appeng/me/storage/CreativeCellInventory.java +++ b/src/main/java/appeng/me/storage/CreativeCellInventory.java @@ -36,7 +36,7 @@ import appeng.util.item.AEItemStack; public class CreativeCellInventory implements IMEInventoryHandler { - final IItemList itemListCache = AEApi.instance().storage().createItemList(); + private final IItemList itemListCache = AEApi.instance().storage().createItemList(); protected CreativeCellInventory( final ItemStack o ) { diff --git a/src/main/java/appeng/me/storage/DriveWatcher.java b/src/main/java/appeng/me/storage/DriveWatcher.java index 9f55e9ef..5eb70867 100644 --- a/src/main/java/appeng/me/storage/DriveWatcher.java +++ b/src/main/java/appeng/me/storage/DriveWatcher.java @@ -32,10 +32,10 @@ import appeng.api.storage.data.IAEStack; public class DriveWatcher> extends MEInventoryHandler { - final int oldStatus = 0; - final ItemStack is; - final ICellHandler handler; - final IChestOrDrive cord; + private final int oldStatus = 0; + private final ItemStack is; + private final ICellHandler handler; + private final IChestOrDrive cord; public DriveWatcher( final IMEInventory i, final ItemStack is, final ICellHandler han, final IChestOrDrive cod ) { diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index 91699ad9..84f458a5 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -35,9 +35,9 @@ import appeng.me.cache.GridStorageCache; public class ItemWatcher implements IStackWatcher { - final GridStorageCache gsc; - final IStackWatcherHost myObject; - final HashSet myInterests = new HashSet(); + private final GridStorageCache gsc; + private final IStackWatcherHost myObject; + private final HashSet myInterests = new HashSet(); public ItemWatcher( final GridStorageCache cache, final IStackWatcherHost host ) { @@ -94,13 +94,13 @@ public class ItemWatcher implements IStackWatcher return false; } - return this.myInterests.add( e.copy() ) && this.gsc.interestManager.put( e, this ); + return this.myInterests.add( e.copy() ) && this.gsc.getInterestManager().put( e, this ); } @Override public boolean remove( final Object o ) { - return this.myInterests.remove( o ) && this.gsc.interestManager.remove( (IAEStack) o, this ); + return this.myInterests.remove( o ) && this.gsc.getInterestManager().remove( (IAEStack) o, this ); } @Override @@ -157,17 +157,17 @@ public class ItemWatcher implements IStackWatcher final Iterator i = this.myInterests.iterator(); while( i.hasNext() ) { - this.gsc.interestManager.remove( i.next(), this ); + this.gsc.getInterestManager().remove( i.next(), this ); i.remove(); } } - class ItemWatcherIterator implements Iterator + private class ItemWatcherIterator implements Iterator { - final ItemWatcher watcher; - final Iterator interestIterator; - IAEStack myLast; + private final ItemWatcher watcher; + private final Iterator interestIterator; + private IAEStack myLast; public ItemWatcherIterator( final ItemWatcher parent, final Iterator i ) { @@ -190,7 +190,7 @@ public class ItemWatcher implements IStackWatcher @Override public void remove() { - ItemWatcher.this.gsc.interestManager.remove( this.myLast, this.watcher ); + ItemWatcher.this.gsc.getInterestManager().remove( this.myLast, this.watcher ); this.interestIterator.remove(); } } diff --git a/src/main/java/appeng/me/storage/MEIInventoryWrapper.java b/src/main/java/appeng/me/storage/MEIInventoryWrapper.java index 22826eb1..25264e6f 100644 --- a/src/main/java/appeng/me/storage/MEIInventoryWrapper.java +++ b/src/main/java/appeng/me/storage/MEIInventoryWrapper.java @@ -36,8 +36,8 @@ import appeng.util.item.AEItemStack; public class MEIInventoryWrapper implements IMEInventory { - protected final IInventory target; - protected final InventoryAdaptor adaptor; + private final IInventory target; + private final InventoryAdaptor adaptor; public MEIInventoryWrapper( final IInventory m, final InventoryAdaptor ia ) { diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java index 79eb4713..062f02c3 100644 --- a/src/main/java/appeng/me/storage/MEInventoryHandler.java +++ b/src/main/java/appeng/me/storage/MEInventoryHandler.java @@ -25,7 +25,6 @@ import appeng.api.config.IncludeExclude; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventoryHandler; -import appeng.api.storage.IMEMonitor; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; @@ -36,9 +35,7 @@ import appeng.util.prioitylist.IPartitionList; public class MEInventoryHandler> implements IMEInventoryHandler { - protected final IMEMonitor monitor; - protected final IMEInventoryHandler internal; - final StorageChannel channel; + private final IMEInventoryHandler internal; private int myPriority; private IncludeExclude myWhitelist; private AccessRestriction myAccess; @@ -50,8 +47,6 @@ public class MEInventoryHandler> implements IMEInventoryHa public MEInventoryHandler( final IMEInventory i, final StorageChannel channel ) { - this.channel = channel; - if( i instanceof IMEInventoryHandler ) { this.internal = (IMEInventoryHandler) i; @@ -61,15 +56,13 @@ public class MEInventoryHandler> implements IMEInventoryHa this.internal = new MEPassThrough( i, channel ); } - this.monitor = this.internal instanceof IMEMonitor ? (IMEMonitor) this.internal : null; - this.myPriority = 0; this.myWhitelist = IncludeExclude.WHITELIST; this.setBaseAccess( AccessRestriction.READ_WRITE ); this.myPartitionList = new DefaultPriorityList(); } - public IncludeExclude getWhitelist() + IncludeExclude getWhitelist() { return this.myWhitelist; } @@ -92,7 +85,7 @@ public class MEInventoryHandler> implements IMEInventoryHa this.hasWriteAccess = this.cachedAccessRestriction.hasPermission( AccessRestriction.WRITE ); } - public IPartitionList getPartitionList() + IPartitionList getPartitionList() { return this.myPartitionList; } diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index 5a7dbbd0..09f6c3c9 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -47,12 +47,12 @@ import appeng.util.inv.ItemSlot; public class MEMonitorIInventory implements IMEMonitor { - final InventoryAdaptor adaptor; - final IItemList list = AEApi.instance().storage().createItemList(); - final HashMap, Object> listeners = new HashMap, Object>(); + private final InventoryAdaptor adaptor; + private final IItemList list = AEApi.instance().storage().createItemList(); + private final HashMap, Object> listeners = new HashMap, Object>(); private final NavigableMap memory; - public BaseActionSource mySource; - public StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; + private BaseActionSource mySource; + private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; public MEMonitorIInventory( final InventoryAdaptor adaptor ) { @@ -149,16 +149,16 @@ public class MEMonitorIInventory implements IMEMonitor boolean changed = false; for( final ItemSlot is : this.adaptor ) { - final CachedItemStack old = this.memory.get( is.slot ); - high = Math.max( high, is.slot ); + final CachedItemStack old = this.memory.get( is.getSlot() ); + high = Math.max( high, is.getSlot() ); - final ItemStack newIS = !is.isExtractable && this.mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack(); + final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack(); final ItemStack oldIS = old == null ? null : old.itemStack; if( this.isDifferent( newIS, oldIS ) ) { final CachedItemStack cis = new CachedItemStack( is.getItemStack() ); - this.memory.put( is.slot, cis ); + this.memory.put( is.getSlot(), cis ); if( old != null && old.aeStack != null ) { @@ -189,7 +189,7 @@ public class MEMonitorIInventory implements IMEMonitor if( diff != 0 && stack != null ) { final CachedItemStack cis = new CachedItemStack( is.getItemStack() ); - this.memory.put( is.slot, cis ); + this.memory.put( is.getSlot(), cis ); final IAEItemStack a = stack.copy(); a.setStackSize( diff ); @@ -251,7 +251,7 @@ public class MEMonitorIInventory implements IMEMonitor final IMEMonitorHandlerReceiver key = l.getKey(); if( key.isValid( l.getValue() ) ) { - key.postChange( this, a, this.mySource ); + key.postChange( this, a, this.getActionSource() ); } else { @@ -314,11 +314,31 @@ public class MEMonitorIInventory implements IMEMonitor return this.list; } - static class CachedItemStack + private StorageFilter getMode() + { + return this.mode; + } + + public void setMode( final StorageFilter mode ) + { + this.mode = mode; + } + + private BaseActionSource getActionSource() + { + return this.mySource; + } + + public void setActionSource( final BaseActionSource mySource ) + { + this.mySource = mySource; + } + + private static class CachedItemStack { - final ItemStack itemStack; - final IAEItemStack aeStack; + private final ItemStack itemStack; + private final IAEItemStack aeStack; public CachedItemStack( final ItemStack is ) { diff --git a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java index dfc054c0..d0612910 100644 --- a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java +++ b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java @@ -38,9 +38,9 @@ import appeng.util.inv.ItemListIgnoreCrafting; public class MEMonitorPassThrough> extends MEPassThrough implements IMEMonitor, IMEMonitorHandlerReceiver { - final HashMap, Object> listeners = new HashMap, Object>(); - public BaseActionSource changeSource; - IMEMonitor monitor; + private final HashMap, Object> listeners = new HashMap, Object>(); + private BaseActionSource changeSource; + private IMEMonitor monitor; public MEMonitorPassThrough( final IMEInventory i, final StorageChannel channel ) { @@ -60,7 +60,7 @@ public class MEMonitorPassThrough> extends MEPassThrough before = this.getInternal() == null ? this.channel.createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.channel.createList() ) ); + final IItemList before = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); super.setInternal( i ); if( i instanceof IMEMonitor ) @@ -68,14 +68,14 @@ public class MEMonitorPassThrough> extends MEPassThrough) i; } - final IItemList after = this.getInternal() == null ? this.channel.createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.channel.createList() ) ); + final IItemList after = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) ); if( this.monitor != null ) { this.monitor.addListener( this, this.monitor ); } - Platform.postListChanges( before, after, this, this.changeSource ); + Platform.postListChanges( before, after, this, this.getChangeSource() ); } @Override @@ -102,7 +102,7 @@ public class MEMonitorPassThrough> extends MEPassThrough out = this.channel.createList(); + final IItemList out = this.getWrappedChannel().createList(); this.getInternal().getAvailableItems( new ItemListIgnoreCrafting( out ) ); return out; } @@ -152,4 +152,14 @@ public class MEMonitorPassThrough> extends MEPassThrough> implements IMEInventoryHandler { - protected final StorageChannel channel; + private final StorageChannel wrappedChannel; private IMEInventory internal; public MEPassThrough( final IMEInventory i, final StorageChannel channel ) { - this.channel = channel; + this.wrappedChannel = channel; this.setInternal( i ); } @@ -110,4 +110,9 @@ public class MEPassThrough> implements IMEInventoryHandler { return true; } + + StorageChannel getWrappedChannel() + { + return this.wrappedChannel; + } } diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 729baa36..c5a83796 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -47,8 +47,8 @@ import appeng.util.ItemSorters; public class NetworkInventoryHandler> implements IMEInventoryHandler { - static final ThreadLocal DEPTH_MOD = new ThreadLocal(); - static final ThreadLocal DEPTH_SIM = new ThreadLocal(); + private static final ThreadLocal DEPTH_MOD = new ThreadLocal(); + private static final ThreadLocal DEPTH_SIM = new ThreadLocal(); private static final Comparator PRIORITY_SORTER = new Comparator() { @@ -58,12 +58,12 @@ public class NetworkInventoryHandler> implements IMEInvent return ItemSorters.compareInt( o2, o1 ); } }; - static int currentPass = 0; - final StorageChannel myChannel; - final SecurityCache security; + private static int currentPass = 0; + private final StorageChannel myChannel; + private final SecurityCache security; // final TreeMultimap> priorityInventory; private final NavigableMap>> priorityInventory; - int myPass = 0; + private int myPass = 0; public NetworkInventoryHandler( final StorageChannel chan, final SecurityCache security ) { @@ -166,7 +166,7 @@ public class NetworkInventoryHandler> implements IMEInvent } final IGrid gn = n.getGrid(); - if( gn != this.security.myGrid ) + if( gn != this.security.getGrid() ) { final ISecurityGrid sg = gn.getCache( ISecurityGrid.class ); diff --git a/src/main/java/appeng/me/storage/SecurityInventory.java b/src/main/java/appeng/me/storage/SecurityInventory.java index 3e448aa3..e5a0e9dc 100644 --- a/src/main/java/appeng/me/storage/SecurityInventory.java +++ b/src/main/java/appeng/me/storage/SecurityInventory.java @@ -39,8 +39,8 @@ import appeng.tile.misc.TileSecurity; public class SecurityInventory implements IMEInventoryHandler { - public final IItemList storedItems = AEApi.instance().storage().createItemList(); - final TileSecurity securityTile; + private final IItemList storedItems = AEApi.instance().storage().createItemList(); + private final TileSecurity securityTile; public SecurityInventory( final TileSecurity ts ) { @@ -61,7 +61,7 @@ public class SecurityInventory implements IMEInventoryHandler return null; } - this.storedItems.add( input ); + this.getStoredItems().add( input ); this.securityTile.inventoryChanged(); return null; } @@ -91,7 +91,7 @@ public class SecurityInventory implements IMEInventoryHandler { if( this.hasPermission( src ) ) { - final IAEItemStack target = this.storedItems.findPrecise( request ); + final IAEItemStack target = this.getStoredItems().findPrecise( request ); if( target != null ) { final IAEItemStack output = target.copy(); @@ -112,7 +112,7 @@ public class SecurityInventory implements IMEInventoryHandler @Override public IItemList getAvailableItems( final IItemList out ) { - for( final IAEItemStack ais : this.storedItems ) + for( final IAEItemStack ais : this.getStoredItems() ) { out.add( ais ); } @@ -152,7 +152,7 @@ public class SecurityInventory implements IMEInventoryHandler return false; } - for( final IAEItemStack ais : this.storedItems ) + for( final IAEItemStack ais : this.getStoredItems() ) { if( ais.isMeaningful() ) { @@ -191,4 +191,9 @@ public class SecurityInventory implements IMEInventoryHandler { return true; } + + public IItemList getStoredItems() + { + return this.storedItems; + } } diff --git a/src/main/java/appeng/me/storage/VoidFluidInventory.java b/src/main/java/appeng/me/storage/VoidFluidInventory.java index 3cab7082..af98dc6e 100644 --- a/src/main/java/appeng/me/storage/VoidFluidInventory.java +++ b/src/main/java/appeng/me/storage/VoidFluidInventory.java @@ -32,7 +32,7 @@ import appeng.tile.misc.TileCondenser; public class VoidFluidInventory implements IMEInventoryHandler { - final TileCondenser target; + private final TileCondenser target; public VoidFluidInventory( final TileCondenser te ) { diff --git a/src/main/java/appeng/me/storage/VoidItemInventory.java b/src/main/java/appeng/me/storage/VoidItemInventory.java index 5400e75b..57ed06fc 100644 --- a/src/main/java/appeng/me/storage/VoidItemInventory.java +++ b/src/main/java/appeng/me/storage/VoidItemInventory.java @@ -32,7 +32,7 @@ import appeng.tile.misc.TileCondenser; public class VoidItemInventory implements IMEInventoryHandler { - final TileCondenser target; + private final TileCondenser target; public VoidItemInventory( final TileCondenser te ) { diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 8e483eef..d0b51ad6 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -78,12 +78,12 @@ import appeng.util.SettingsFrom; public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradeableHost, ICustomNameObject { - protected final AENetworkProxy proxy; - protected final ItemStack is; - protected ISimplifiedBundle renderCache = null; - protected TileEntity tile = null; - protected IPartHost host = null; - protected ForgeDirection side = null; + private final AENetworkProxy proxy; + private final ItemStack is; + private ISimplifiedBundle renderCache = null; + private TileEntity tile = null; + private IPartHost host = null; + private ForgeDirection side = null; public AEBasePart( final ItemStack is ) { @@ -114,13 +114,13 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, @Override public void securityBreak() { - if( this.is.stackSize > 0 ) + if( this.getItemStack().stackSize > 0 ) { final List items = new ArrayList(); - items.add( this.is.copy() ); - this.host.removePart( this.side, false ); + items.add( this.getItemStack().copy() ); + this.host.removePart( this.getSide(), false ); Platform.spawnDrops( this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, items ); - this.is.stackSize = 0; + this.getItemStack().stackSize = 0; } } @@ -194,7 +194,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, @Override public String getCustomName() { - return this.is.getDisplayName(); + return this.getItemStack().getDisplayName(); } @Override @@ -208,12 +208,12 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, @Override public boolean hasCustomName() { - return this.is.hasDisplayName(); + return this.getItemStack().hasDisplayName(); } public void addEntityCrashInfo( final CrashReportCategory crashreportcategory ) { - crashreportcategory.addCrashSection( "Part Side", this.side ); + crashreportcategory.addCrashSection( "Part Side", this.getSide() ); } @Override @@ -316,7 +316,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, @Override public void setPartHostInfo( final ForgeDirection side, final IPartHost host, final TileEntity tile ) { - this.side = side; + this.setSide( side ); this.tile = tile; this.host = host; } @@ -376,7 +376,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, * @param from source of settings * @param compound compound of source */ - public void uploadSettings( final SettingsFrom from, final NBTTagCompound compound ) + private void uploadSettings( final SettingsFrom from, final NBTTagCompound compound ) { if( compound != null ) { @@ -413,7 +413,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, * * @return compound of source */ - public NBTTagCompound downloadSettings( final SettingsFrom from ) + private NBTTagCompound downloadSettings( final SettingsFrom from ) { final NBTTagCompound output = new NBTTagCompound(); @@ -549,4 +549,29 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, { return null; } + + public ForgeDirection getSide() + { + return this.side; + } + + private void setSide( final ForgeDirection side ) + { + this.side = side; + } + + public ItemStack getItemStack() + { + return this.is; + } + + public ISimplifiedBundle getRenderCache() + { + return this.renderCache; + } + + public void setRenderCache( final ISimplifiedBundle renderCache ) + { + this.renderCache = renderCache; + } } \ No newline at end of file diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 2a4af32a..4f6df094 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -31,7 +31,7 @@ import appeng.api.parts.IPartCollisionHelper; public class BusCollisionHelper implements IPartCollisionHelper { - final List boxes; + private final List boxes; private final ForgeDirection x; private final ForgeDirection y; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 3a5c358a..18c610e8 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -77,10 +77,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I private static final ThreadLocal IS_LOADING = new ThreadLocal(); private final EnumSet myLayerFlags = EnumSet.noneOf( LayerFlags.class ); - public YesNo hasRedstone = YesNo.UNDECIDED; - public IPartHost tcb; - public boolean requiresDynamicRender = false; - boolean inWorld = false; + private YesNo hasRedstone = YesNo.UNDECIDED; + private IPartHost tcb; + private boolean requiresDynamicRender = false; + private boolean inWorld = false; public CableBusContainer( final IPartHost host ) { @@ -542,15 +542,15 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I this.hasRedstone = te.getWorldObj().isBlockIndirectlyGettingPowered( te.xCoord, te.yCoord, te.zCoord ) ? YesNo.YES : YesNo.NO; } - public void updateDynamicRender() + private void updateDynamicRender() { - this.requiresDynamicRender = false; + this.setRequiresDynamicRender( false ); for( final ForgeDirection s : ForgeDirection.VALID_DIRECTIONS ) { final IPart p = this.getPart( s ); if( p != null ) { - this.requiresDynamicRender = this.requiresDynamicRender || p.requireDynamicRender(); + this.setRequiresDynamicRender( this.isRequiresDynamicRender() || p.requireDynamicRender() ); } } } @@ -1015,7 +1015,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } } - ForgeDirection getSide( final IPart part ) + private ForgeDirection getSide( final IPart part ) { if( this.getCenter() == part ) { @@ -1136,4 +1136,14 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I } return false; } + + public boolean isRequiresDynamicRender() + { + return this.requiresDynamicRender; + } + + private void setRequiresDynamicRender( final boolean requiresDynamicRender ) + { + this.requiresDynamicRender = requiresDynamicRender; + } } diff --git a/src/main/java/appeng/parts/PartBasicState.java b/src/main/java/appeng/parts/PartBasicState.java index e16731a5..7288a689 100644 --- a/src/main/java/appeng/parts/PartBasicState.java +++ b/src/main/java/appeng/parts/PartBasicState.java @@ -48,12 +48,12 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel protected static final int POWERED_FLAG = 1; protected static final int CHANNEL_FLAG = 2; - protected int clientFlags = 0; // sent as byte. + private int clientFlags = 0; // sent as byte. public PartBasicState( final ItemStack is ) { super( is ); - this.proxy.setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); } @MENetworkEventSubscribe @@ -72,7 +72,7 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel public void renderLights( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { rh.normalRendering(); - this.setColors( ( this.clientFlags & ( POWERED_FLAG | CHANNEL_FLAG ) ) == ( POWERED_FLAG | CHANNEL_FLAG ), ( this.clientFlags & POWERED_FLAG ) == POWERED_FLAG ); + this.setColors( ( this.getClientFlags() & ( POWERED_FLAG | CHANNEL_FLAG ) ) == ( POWERED_FLAG | CHANNEL_FLAG ), ( this.getClientFlags() & POWERED_FLAG ) == POWERED_FLAG ); rh.renderFace( x, y, z, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), ForgeDirection.EAST, renderer ); rh.renderFace( x, y, z, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), ForgeDirection.WEST, renderer ); rh.renderFace( x, y, z, CableBusTextures.PartMonitorSidesStatusLights.getIcon(), ForgeDirection.UP, renderer ); @@ -105,28 +105,28 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel { super.writeToStream( data ); - this.clientFlags = 0; + this.setClientFlags( 0 ); try { - if( this.proxy.getEnergy().isNetworkPowered() ) + if( this.getProxy().getEnergy().isNetworkPowered() ) { - this.clientFlags |= POWERED_FLAG; + this.setClientFlags( this.getClientFlags() | POWERED_FLAG ); } - if( this.proxy.getNode().meetsChannelRequirements() ) + if( this.getProxy().getNode().meetsChannelRequirements() ) { - this.clientFlags |= CHANNEL_FLAG; + this.setClientFlags( this.getClientFlags() | CHANNEL_FLAG ); } - this.clientFlags = this.populateFlags( this.clientFlags ); + this.setClientFlags( this.populateFlags( this.getClientFlags() ) ); } catch( final GridAccessException e ) { // meh } - data.writeByte( (byte) this.clientFlags ); + data.writeByte( (byte) this.getClientFlags() ); } protected int populateFlags( final int cf ) @@ -139,10 +139,10 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel { final boolean eh = super.readFromStream( data ); - final int old = this.clientFlags; - this.clientFlags = data.readByte(); + final int old = this.getClientFlags(); + this.setClientFlags( data.readByte() ); - return eh || old != this.clientFlags; + return eh || old != this.getClientFlags(); } @Override @@ -155,12 +155,22 @@ public abstract class PartBasicState extends AEBasePart implements IPowerChannel @Override public boolean isPowered() { - return ( this.clientFlags & POWERED_FLAG ) == POWERED_FLAG; + return ( this.getClientFlags() & POWERED_FLAG ) == POWERED_FLAG; } @Override public boolean isActive() { - return ( this.clientFlags & CHANNEL_FLAG ) == CHANNEL_FLAG; + return ( this.getClientFlags() & CHANNEL_FLAG ) == CHANNEL_FLAG; + } + + public int getClientFlags() + { + return this.clientFlags; + } + + private void setClientFlags( final int clientFlags ) + { + this.clientFlags = clientFlags; } } diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index ff6febf4..a3c0ca02 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -69,7 +69,7 @@ import appeng.util.Platform; public class PartPlacement { - public static float eyeHeight = 0.0f; + private static float eyeHeight = 0.0f; private final ThreadLocal placing = new ThreadLocal(); private boolean wasCanceled = false; @@ -103,7 +103,7 @@ public class PartPlacement if( !world.isRemote ) { final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.a, dir.b ); + final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.getA(), dir.getB() ); if( mop != null ) { final List is = new LinkedList(); @@ -212,7 +212,7 @@ public class PartPlacement if( host != null && player.isSneaking() && block != null ) { final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.a, dir.b ); + final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.getA(), dir.getB() ); if( mop != null ) { mop.hitVec = mop.hitVec.addVector( -mop.blockX, -mop.blockY, -mop.blockZ ); @@ -343,7 +343,7 @@ public class PartPlacement { final Block block = world.getBlock( x, y, z ); final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) ); - final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.a, dir.b ); + final MovingObjectPosition mop = block.collisionRayTrace( world, x, y, z, dir.getA(), dir.getB() ); if( mop != null ) { final SelectedPart sp = selectPart( player, host, mop.hitVec.addVector( -mop.blockX, -mop.blockY, -mop.blockZ ) ); @@ -399,7 +399,7 @@ public class PartPlacement return Platform.getEyeOffset( p ); } - return eyeHeight; + return getEyeHeight(); } private static SelectedPart selectPart( final EntityPlayer player, final IPartHost host, final Vec3 pos ) @@ -492,6 +492,16 @@ public class PartPlacement } } + private static float getEyeHeight() + { + return eyeHeight; + } + + public static void setEyeHeight( final float eyeHeight ) + { + PartPlacement.eyeHeight = eyeHeight; + } + public enum PlaceType { PLACE_ITEM, INTERACT_FIRST_PASS, INTERACT_SECOND_PASS diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index e69c22b3..c67dd129 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -113,22 +113,22 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final ForgeDirection e = bch.getWorldX(); final ForgeDirection u = bch.getWorldY(); - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.getSide() ) ) { minX = 0; } - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.getSide() ) ) { maxX = 16; } - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.getSide() ) ) { minY = 0; } - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.getSide() ) ) { maxY = 16; } @@ -142,7 +142,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, this.is.getIconIndex(), SIDE_ICON, SIDE_ICON ); + rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, this.getItemStack().getIconIndex(), SIDE_ICON, SIDE_ICON ); rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.renderInventoryBox( renderer ); @@ -167,38 +167,38 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final TileEntity te = this.getHost().getTile(); - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.getSide() ) ) { minX = 0; } int maxX = 15; - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.getSide() ) ) { maxX = 16; } int minY = 1; - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.getSide() ) ) { minY = 0; } int maxY = 15; - if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) ) + if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.getSide() ) ) { maxY = 16; } - final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); + final boolean isActive = ( this.getClientFlags() & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : this.is.getIconIndex(), SIDE_ICON, SIDE_ICON ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( SIDE_ICON, SIDE_ICON, BACK_ICON, isActive ? activeIcon : this.getItemStack().getIconIndex(), SIDE_ICON, SIDE_ICON ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : this.is.getIconIndex(), STATUS_ICON, STATUS_ICON ); + rh.setTexture( STATUS_ICON, STATUS_ICON, BACK_ICON, isActive ? activeIcon : this.getItemStack().getIconIndex(), STATUS_ICON, STATUS_ICON ); rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.renderBlock( x, y, z, renderer ); @@ -212,7 +212,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab this.isAccepting = true; try { - this.proxy.getTick().alertDevice( this.proxy.getNode() ); + this.getProxy().getTick().alertDevice( this.getProxy().getNode() ); } catch( final GridAccessException e ) { @@ -223,19 +223,19 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab @Override public void onEntityCollision( final Entity entity ) { - if( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() ) + if( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.getProxy().isActive() ) { boolean capture = false; - switch( this.side ) + switch( this.getSide() ) { case DOWN: case UP: - if( entity.posX > this.tile.xCoord && entity.posX < this.tile.xCoord + 1 ) + if( entity.posX > this.getTile().xCoord && entity.posX < this.getTile().xCoord + 1 ) { - if( entity.posZ > this.tile.zCoord && entity.posZ < this.tile.zCoord + 1 ) + if( entity.posZ > this.getTile().zCoord && entity.posZ < this.getTile().zCoord + 1 ) { - if( ( entity.posY > this.tile.yCoord + 0.9 && this.side == ForgeDirection.UP ) || ( entity.posY < this.tile.yCoord + 0.1 && this.side == ForgeDirection.DOWN ) ) + if( ( entity.posY > this.getTile().yCoord + 0.9 && this.getSide() == ForgeDirection.UP ) || ( entity.posY < this.getTile().yCoord + 0.1 && this.getSide() == ForgeDirection.DOWN ) ) { capture = true; } @@ -244,11 +244,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab break; case SOUTH: case NORTH: - if( entity.posX > this.tile.xCoord && entity.posX < this.tile.xCoord + 1 ) + if( entity.posX > this.getTile().xCoord && entity.posX < this.getTile().xCoord + 1 ) { - if( entity.posY > this.tile.yCoord && entity.posY < this.tile.yCoord + 1 ) + if( entity.posY > this.getTile().yCoord && entity.posY < this.getTile().yCoord + 1 ) { - if( ( entity.posZ > this.tile.zCoord + 0.9 && this.side == ForgeDirection.SOUTH ) || ( entity.posZ < this.tile.zCoord + 0.1 && this.side == ForgeDirection.NORTH ) ) + if( ( entity.posZ > this.getTile().zCoord + 0.9 && this.getSide() == ForgeDirection.SOUTH ) || ( entity.posZ < this.getTile().zCoord + 0.1 && this.getSide() == ForgeDirection.NORTH ) ) { capture = true; } @@ -257,11 +257,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab break; case EAST: case WEST: - if( entity.posZ > this.tile.zCoord && entity.posZ < this.tile.zCoord + 1 ) + if( entity.posZ > this.getTile().zCoord && entity.posZ < this.getTile().zCoord + 1 ) { - if( entity.posY > this.tile.yCoord && entity.posY < this.tile.yCoord + 1 ) + if( entity.posY > this.getTile().yCoord && entity.posY < this.getTile().yCoord + 1 ) { - if( ( entity.posX > this.tile.xCoord + 0.9 && this.side == ForgeDirection.EAST ) || ( entity.posX < this.tile.xCoord + 0.1 && this.side == ForgeDirection.WEST ) ) + if( ( entity.posX > this.getTile().xCoord + 0.9 && this.getSide() == ForgeDirection.EAST ) || ( entity.posX < this.getTile().xCoord + 0.1 && this.getSide() == ForgeDirection.WEST ) ) { capture = true; } @@ -279,7 +279,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab if( changed ) { - ServerHelper.proxy.sendToAllNearExcept( null, this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, 64, this.tile.getWorldObj(), new PacketTransitionEffect( entity.posX, entity.posY, entity.posZ, this.side, false ) ); + ServerHelper.proxy.sendToAllNearExcept( null, this.getTile().xCoord, this.getTile().yCoord, this.getTile().zCoord, 64, this.getTile().getWorldObj(), new PacketTransitionEffect( entity.posX, entity.posY, entity.posZ, this.getSide(), false ) ); } } } @@ -319,8 +319,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final IAEItemStack itemToStore = AEItemStack.create( item ); try { - final IStorageGrid storage = this.proxy.getStorage(); - final IEnergyGrid energy = this.proxy.getEnergy(); + final IStorageGrid storage = this.getProxy().getStorage(); + final IEnergyGrid energy = this.getProxy().getEnergy(); final IAEItemStack overflow = Platform.poweredInsert( energy, storage.getItemInventory(), itemToStore, this.mySrc ); this.isAccepting = overflow == null; @@ -375,9 +375,9 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab final TileEntity te = this.getTile(); final WorldServer w = (WorldServer) te.getWorldObj(); - final double x = te.xCoord + this.side.offsetX + .5d; - final double y = te.yCoord + this.side.offsetY + .5d; - final double z = te.zCoord + this.side.offsetZ + .5d; + final double x = te.xCoord + this.getSide().offsetX + .5d; + final double y = te.yCoord + this.getSide().offsetY + .5d; + final double z = te.zCoord + this.getSide().offsetZ + .5d; final EntityItem overflowEntity = new EntityItem( w, x, y, z, overflow.getItemStack() ); overflowEntity.motionX = 0; @@ -413,20 +413,20 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab this.getHost().markForUpdate(); } - public TickRateModulation breakBlock( final boolean modulate ) + private TickRateModulation breakBlock( final boolean modulate ) { - if( this.isAccepting && this.proxy.isActive() ) + if( this.isAccepting && this.getProxy().isActive() ) { try { final TileEntity te = this.getTile(); final WorldServer w = (WorldServer) te.getWorldObj(); - final int x = te.xCoord + this.side.offsetX; - final int y = te.yCoord + this.side.offsetY; - final int z = te.zCoord + this.side.offsetZ; + final int x = te.xCoord + this.getSide().offsetX; + final int y = te.yCoord + this.getSide().offsetY; + final int z = te.zCoord + this.getSide().offsetZ; - final IEnergyGrid energy = this.proxy.getEnergy(); + final IEnergyGrid energy = this.getProxy().getEnergy(); if( this.canHandleBlock( w, x, y, z ) ) { @@ -442,12 +442,12 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab { energy.extractAEPower( requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG ); this.breakBlockAndStoreItems( w, x, y, z, items ); - ServerHelper.proxy.sendToAllNearExcept( null, x, y, z, 64, w, new PacketTransitionEffect( x, y, z, this.side, true ) ); + ServerHelper.proxy.sendToAllNearExcept( null, x, y, z, 64, w, new PacketTransitionEffect( x, y, z, this.getSide(), true ) ); } else { this.breaking = true; - TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this ); + TickHandler.INSTANCE.addCallable( this.getTile().getWorldObj(), this ); } return TickRateModulation.URGENT; } @@ -466,7 +466,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.AnnihilationPlane.min, TickRates.AnnihilationPlane.max, false, true ); + return new TickingRequest( TickRates.AnnihilationPlane.getMin(), TickRates.AnnihilationPlane.getMax(), false, true ); } @Override @@ -484,7 +484,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab /** * Checks if this plane can handle the block at the specific coordinates. */ - protected boolean canHandleBlock( final WorldServer w, final int x, final int y, final int z ) + private boolean canHandleBlock( final WorldServer w, final int x, final int y, final int z ) { final Block block = w.getBlock( x, y, z ); final Material material = block.getMaterial(); @@ -527,13 +527,13 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab * * @return true, if the network can store at least a single item of all drops or no drops are reported */ - protected boolean canStoreItemStacks( final List itemStacks ) + private boolean canStoreItemStacks( final List itemStacks ) { boolean canStore = itemStacks.isEmpty(); try { - final IStorageGrid storage = this.proxy.getStorage(); + final IStorageGrid storage = this.getProxy().getStorage(); for( final ItemStack itemStack : itemStacks ) { @@ -554,7 +554,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab return canStore; } - protected void breakBlockAndStoreItems( final WorldServer w, final int x, final int y, final int z, final List items ) + private void breakBlockAndStoreItems( final WorldServer w, final int x, final int y, final int z, final List items ) { w.setBlock( x, y, z, Platform.AIR_BLOCK, 0, 3 ); diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index f4e31475..fcebc209 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -104,7 +104,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @Override protected TickRateModulation doBusWork() { - if( !this.proxy.isActive() || !this.canDoBusWork() ) + if( !this.getProxy().isActive() || !this.canDoBusWork() ) { return TickRateModulation.IDLE; } @@ -115,9 +115,9 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest try { final InventoryAdaptor destination = this.getHandler(); - final IMEMonitor inv = this.proxy.getStorage().getItemInventory(); - final IEnergyGrid energy = this.proxy.getEnergy(); - final ICraftingGrid cg = this.proxy.getCrafting(); + final IMEMonitor inv = this.getProxy().getStorage().getItemInventory(); + final IEnergyGrid energy = this.getProxy().getEnergy(); + final ICraftingGrid cg = this.getProxy().getCrafting(); final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ); final SchedulingMode schedulingMode = (SchedulingMode) this.getConfigManager().getSetting( Settings.SCHEDULING_MODE ); @@ -129,13 +129,13 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest { final int slotToExport = this.getStartingSlot( schedulingMode, x ); - final IAEItemStack ais = this.config.getAEStackInSlot( slotToExport ); + final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport ); if( ais == null || this.itemToSend <= 0 || this.craftOnly() ) { if( this.isCraftingEnabled() ) { - this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorldObj(), this.proxy.getGrid(), cg, this.mySrc ) || this.didSomething; + this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorldObj(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething; } continue; } @@ -160,7 +160,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest if( this.itemToSend == before && this.isCraftingEnabled() ) { - this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorldObj(), this.proxy.getGrid(), cg, this.mySrc ) || this.didSomething; + this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorldObj(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething; } } @@ -199,7 +199,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.renderInventoryBox( renderer ); @@ -215,8 +215,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); rh.setBounds( 4, 4, 12, 12, 12, 14 ); rh.renderBlock( x, y, z, renderer ); @@ -227,7 +227,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest rh.setBounds( 6, 6, 15, 10, 10, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.renderBlock( x, y, z, renderer ); @@ -251,7 +251,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_BUS ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS ); return true; } @@ -261,7 +261,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.ExportBus.min, TickRates.ExportBus.max, this.isSleeping(), false ); + return new TickingRequest( TickRates.ExportBus.getMin(), TickRates.ExportBus.getMax(), this.isSleeping(), false ); } @Override @@ -289,9 +289,9 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest try { - if( d != null && this.proxy.isActive() ) + if( d != null && this.getProxy().isActive() ) { - final IEnergyGrid energy = this.proxy.getEnergy(); + final IEnergyGrid energy = this.getProxy().getEnergy(); final double power = items.getStackSize(); if( energy.extractAEPower( power, mode, PowerMultiplier.CONFIG ) > power - 0.01 ) diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 93bc3175..d4dcd03b 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -86,11 +86,11 @@ import appeng.util.prioitylist.PrecisePriorityList; public class PartFormationPlane extends PartUpgradeable implements ICellContainer, IPriorityHost, IMEInventory { - final MEInventoryHandler myHandler = new MEInventoryHandler( this, StorageChannel.ITEMS ); - final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 ); - int priority = 0; - boolean wasActive = false; - boolean blocked = false; + private final MEInventoryHandler myHandler = new MEInventoryHandler( this, StorageChannel.ITEMS ); + private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 ); + private int priority = 0; + private boolean wasActive = false; + private boolean blocked = false; public PartFormationPlane( final ItemStack is ) { @@ -130,7 +130,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine try { - this.proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { @@ -148,7 +148,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) { this.updateHandler(); - this.host.markForSave(); + this.getHost().markForSave(); } @Override @@ -200,7 +200,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @MENetworkEventSubscribe public void powerRender( final MENetworkPowerStatusChange c ) { - final boolean currentActive = this.proxy.isActive(); + final boolean currentActive = this.getProxy().isActive(); if( this.wasActive != currentActive ) { this.wasActive = currentActive; @@ -212,7 +212,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @MENetworkEventSubscribe public void updateChannels( final MENetworkChannelsChanged changedChannels ) { - final boolean currentActive = this.proxy.isActive(); + final boolean currentActive = this.getProxy().isActive(); if( this.wasActive != currentActive ) { this.wasActive = currentActive; @@ -241,22 +241,22 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine final ForgeDirection e = bch.getWorldX(); final ForgeDirection u = bch.getWorldY(); - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.getSide() ) ) { minX = 0; } - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.getSide() ) ) { maxX = 16; } - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.getSide() ) ) { minY = 0; } - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.getSide() ) ) { maxY = 16; } @@ -270,7 +270,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); + rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setBounds( 1, 1, 15, 15, 15, 16 ); rh.renderInventoryBox( renderer ); @@ -290,38 +290,38 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine final TileEntity te = this.getHost().getTile(); - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - e.offsetX, y - e.offsetY, z - e.offsetZ ), this.getSide() ) ) { minX = 0; } int maxX = 15; - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.getSide() ) ) { maxX = 16; } int minY = 1; - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.getSide() ) ) { minY = 0; } int maxY = 15; - if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) ) + if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.getSide() ) ) { maxY = 16; } - final boolean isActive = ( this.clientFlags & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); + final boolean isActive = ( this.getClientFlags() & ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ) ) == ( PartBasicState.POWERED_FLAG | PartBasicState.CHANNEL_FLAG ); - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : this.is.getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : this.getItemStack().getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); rh.setBounds( minX, minY, 15, maxX, maxY, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 14, 11, 11, 15 ); rh.renderBlock( x, y, z, renderer ); @@ -332,9 +332,9 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @Override public void onNeighborChanged() { - final TileEntity te = this.host.getTile(); + final TileEntity te = this.getHost().getTile(); final World w = te.getWorldObj(); - final ForgeDirection side = this.side; + final ForgeDirection side = this.getSide(); final int x = te.xCoord + side.offsetX; final int y = te.yCoord + side.offsetY; @@ -359,7 +359,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_FORMATION_PLANE ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_FORMATION_PLANE ); return true; } @@ -379,7 +379,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine @Override public List getCellArray( final StorageChannel channel ) { - if( this.proxy.isActive() && channel == StorageChannel.ITEMS ) + if( this.getProxy().isActive() && channel == StorageChannel.ITEMS ) { final List Handler = new ArrayList( 1 ); Handler.add( this.myHandler ); @@ -398,7 +398,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine public void setPriority( final int newValue ) { this.priority = newValue; - this.host.markForSave(); + this.getHost().markForSave(); this.updateHandler(); } @@ -424,9 +424,9 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine long maxStorage = Math.min( input.getStackSize(), is.getMaxStackSize() ); boolean worked = false; - final TileEntity te = this.host.getTile(); + final TileEntity te = this.getHost().getTile(); final World w = te.getWorldObj(); - final ForgeDirection side = this.side; + final ForgeDirection side = this.getSide(); final int x = te.xCoord + side.offsetX; final int y = te.yCoord + side.offsetY; @@ -437,7 +437,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i instanceof ItemReed ) ) { final EntityPlayer player = Platform.getPlayer( (WorldServer) w ); - Platform.configurePlayer( player, side, this.tile ); + Platform.configurePlayer( player, side, this.getTile() ); if( i instanceof ItemFirework ) { diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index 93eab6a0..0cd65f4b 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -103,7 +103,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); + rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderInventoryBox( renderer ); @@ -119,8 +119,8 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); rh.setBounds( 4, 4, 14, 12, 12, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -130,7 +130,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin rh.setBounds( 6, 6, 12, 10, 10, 13 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 11, 10, 10, 12 ); rh.renderBlock( x, y, z, renderer ); @@ -154,7 +154,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_BUS ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_BUS ); return true; } @@ -164,7 +164,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.ImportBus.min, TickRates.ImportBus.max, this.getHandler() == null, false ); + return new TickingRequest( TickRates.ImportBus.getMin(), TickRates.ImportBus.getMax(), this.getHandler() == null, false ); } @Override @@ -176,7 +176,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin @Override protected TickRateModulation doBusWork() { - if( !this.proxy.isActive() || !this.canDoBusWork() ) + if( !this.getProxy().isActive() || !this.canDoBusWork() ) { return TickRateModulation.IDLE; } @@ -191,15 +191,15 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin try { this.itemToSend = this.calculateItemsToSend(); - this.itemToSend = Math.min( this.itemToSend, (int) ( 0.01 + this.proxy.getEnergy().extractAEPower( this.itemToSend, Actionable.SIMULATE, PowerMultiplier.CONFIG ) ) ); + this.itemToSend = Math.min( this.itemToSend, (int) ( 0.01 + this.getProxy().getEnergy().extractAEPower( this.itemToSend, Actionable.SIMULATE, PowerMultiplier.CONFIG ) ) ); - final IMEMonitor inv = this.proxy.getStorage().getItemInventory(); - final IEnergyGrid energy = this.proxy.getEnergy(); + final IMEMonitor inv = this.getProxy().getStorage().getItemInventory(); + final IEnergyGrid energy = this.getProxy().getEnergy(); boolean Configured = false; for( int x = 0; x < this.availableSlots(); x++ ) { - final IAEItemStack ais = this.config.getAEStackInSlot( x ); + final IAEItemStack ais = this.getConfig().getAEStackInSlot( x ); if( ais != null && this.itemToSend > 0 ) { Configured = true; diff --git a/src/main/java/appeng/parts/automation/PartLevelEmitter.java b/src/main/java/appeng/parts/automation/PartLevelEmitter.java index d5ff8c9d..31af13f9 100644 --- a/src/main/java/appeng/parts/automation/PartLevelEmitter.java +++ b/src/main/java/appeng/parts/automation/PartLevelEmitter.java @@ -85,20 +85,19 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH private static final int FLAG_ON = 4; - final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 1 ); + private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 1 ); - boolean prevState = false; + private boolean prevState = false; - long lastReportedValue = 0; - long reportingValue = 0; + private long lastReportedValue = 0; + private long reportingValue = 0; - IStackWatcher myWatcher; - IEnergyWatcher myEnergyWatcher; - ICraftingWatcher myCraftingWatcher; - double centerX; - double centerY; - double centerZ; - boolean status = false; + private IStackWatcher myWatcher; + private IEnergyWatcher myEnergyWatcher; + private ICraftingWatcher myCraftingWatcher; + private double centerX; + private double centerY; + private double centerZ; @Reflected public PartLevelEmitter( final ItemStack is ) @@ -140,11 +139,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH final boolean isOn = this.isLevelEmitterOn(); if( this.prevState != isOn ) { - this.host.markForUpdate(); - final TileEntity te = this.host.getTile(); + this.getHost().markForUpdate(); + final TileEntity te = this.getHost().getTile(); this.prevState = isOn; Platform.notifyBlocksOfNeighbors( te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord ); - Platform.notifyBlocksOfNeighbors( te.getWorldObj(), te.xCoord + this.side.offsetX, te.yCoord + this.side.offsetY, te.zCoord + this.side.offsetZ ); + Platform.notifyBlocksOfNeighbors( te.getWorldObj(), te.xCoord + this.getSide().offsetX, te.yCoord + this.getSide().offsetY, te.zCoord + this.getSide().offsetZ ); } } @@ -152,10 +151,10 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { if( Platform.isClient() ) { - return ( this.clientFlags & FLAG_ON ) == FLAG_ON; + return ( this.getClientFlags() & FLAG_ON ) == FLAG_ON; } - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return false; } @@ -164,7 +163,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { try { - return this.proxy.getCrafting().isRequesting( this.config.getAEStackInSlot( 0 ) ); + return this.getProxy().getCrafting().isRequesting( this.config.getAEStackInSlot( 0 ) ); } catch( final GridAccessException e ) { @@ -193,7 +192,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @Override public IIcon getBreakingTexture() { - return this.is.getIconIndex(); + return this.getItemStack().getIconIndex(); } @Override @@ -210,7 +209,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } // update the system... - public void configureWatchers() + private void configureWatchers() { final IAEItemStack myStack = this.config.getAEStackInSlot( 0 ); @@ -231,7 +230,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH try { - this.proxy.getGrid().postEvent( new MENetworkCraftingPatternChange( this, this.proxy.getNode() ) ); + this.getProxy().getGrid().postEvent( new MENetworkCraftingPatternChange( this, this.getProxy().getNode() ) ); } catch( final GridAccessException e1 ) { @@ -258,11 +257,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH try { // update to power... - this.lastReportedValue = (long) this.proxy.getEnergy().getStoredPower(); + this.lastReportedValue = (long) this.getProxy().getEnergy().getStoredPower(); this.updateState(); // no more item stuff.. - this.proxy.getStorage().getItemInventory().removeListener( this ); + this.getProxy().getStorage().getItemInventory().removeListener( this ); } catch( final GridAccessException e ) { @@ -276,11 +275,11 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || myStack == null ) { - this.proxy.getStorage().getItemInventory().addListener( this, this.proxy.getGrid() ); + this.getProxy().getStorage().getItemInventory().addListener( this, this.getProxy().getGrid() ); } else { - this.proxy.getStorage().getItemInventory().removeListener( this ); + this.getProxy().getStorage().getItemInventory().removeListener( this ); if( this.myWatcher != null ) { @@ -288,7 +287,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } } - this.updateReportingValue( this.proxy.getStorage().getItemInventory() ); + this.updateReportingValue( this.getProxy().getStorage().getItemInventory() ); } catch( final GridAccessException e ) { @@ -370,7 +369,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { try { - return this.proxy.getGrid() == effectiveGrid; + return this.getProxy().getGrid() == effectiveGrid; } catch( final GridAccessException e ) { @@ -389,7 +388,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { try { - this.updateReportingValue( this.proxy.getStorage().getItemInventory() ); + this.updateReportingValue( this.getProxy().getStorage().getItemInventory() ); } catch( final GridAccessException e ) { @@ -413,7 +412,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( this.is.getIconIndex() ); + rh.setTexture( this.getItemStack().getIconIndex() ); Tessellator.instance.startDrawingQuads(); this.renderTorchAtAngle( 0, -0.5, 0 ); Tessellator.instance.draw(); @@ -421,10 +420,10 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH // rh.renderInventoryBox( renderer ); } - public void renderTorchAtAngle( double baseX, double baseY, double baseZ ) + private void renderTorchAtAngle( double baseX, double baseY, double baseZ ) { final boolean isOn = this.isLevelEmitterOn(); - final IIcon offTexture = this.is.getIconIndex(); + final IIcon offTexture = this.getItemStack().getIconIndex(); final IIcon IIcon = ( isOn ? CableBusTextures.LevelEmitterTorchOn.getIcon() : offTexture ); // this.centerX = baseX + 0.5; @@ -529,7 +528,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH this.addVertexWithUV( var36, baseY + 1.0D, baseZ - var44, var17, var18 ); } - public void addVertexWithUV( double x, double y, double z, final double u, final double v ) + private void addVertexWithUV( double x, double y, double z, final double u, final double v ) { final Tessellator var12 = Tessellator.instance; @@ -537,13 +536,13 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH y -= this.centerY; z -= this.centerZ; - if( this.side == ForgeDirection.DOWN ) + if( this.getSide() == ForgeDirection.DOWN ) { y = -y; z = -z; } - if( this.side == ForgeDirection.EAST ) + if( this.getSide() == ForgeDirection.EAST ) { final double m = x; x = y; @@ -551,14 +550,14 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH y = -y; } - if( this.side == ForgeDirection.WEST ) + if( this.getSide() == ForgeDirection.WEST ) { final double m = x; x = -y; y = m; } - if( this.side == ForgeDirection.SOUTH ) + if( this.getSide() == ForgeDirection.SOUTH ) { final double m = z; z = y; @@ -566,7 +565,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH y = -y; } - if( this.side == ForgeDirection.NORTH ) + if( this.getSide() == ForgeDirection.NORTH ) { final double m = z; z = -y; @@ -584,7 +583,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( this.is.getIconIndex() ); + rh.setTexture( this.getItemStack().getIconIndex() ); // rh.setTexture( CableBusTextures.ItemPartLevelEmitterOn.getIcon() ); // rh.setBounds( 2, 2, 14, 14, 14, 16 ); @@ -626,7 +625,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH { if( this.isLevelEmitterOn() ) { - final ForgeDirection d = this.side; + final ForgeDirection d = this.getSide(); final double d0 = d.offsetX * 0.45F + ( r.nextFloat() - 0.5F ) * 0.2D; final double d1 = d.offsetY * 0.45F + ( r.nextFloat() - 0.5F ) * 0.2D; @@ -652,7 +651,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_LEVEL_EMITTER ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_LEVEL_EMITTER ); return true; } diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/PartSharedItemBus.java index 1ccfcfc7..44498319 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/PartSharedItemBus.java @@ -37,7 +37,7 @@ import appeng.util.Platform; public abstract class PartSharedItemBus extends PartUpgradeable implements IGridTickable { - protected final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 9 ); + private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 9 ); private int adaptorHash = 0; private InventoryAdaptor adaptor; private boolean lastRedstone = false; @@ -57,14 +57,14 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid public void readFromNBT( final net.minecraft.nbt.NBTTagCompound extra ) { super.readFromNBT( extra ); - this.config.readFromNBT( extra, "config" ); + this.getConfig().readFromNBT( extra, "config" ); } @Override public void writeToNBT( final net.minecraft.nbt.NBTTagCompound extra ) { super.writeToNBT( extra ); - this.config.writeToNBT( extra, "config" ); + this.getConfig().writeToNBT( extra, "config" ); } @Override @@ -72,7 +72,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid { if( name.equals( "config" ) ) { - return this.config; + return this.getConfig(); } return super.getInventoryByName( name ); @@ -82,7 +82,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid public void onNeighborChanged() { this.updateState(); - if( this.lastRedstone != this.host.hasRedstone( this.side ) ) + if( this.lastRedstone != this.getHost().hasRedstone( this.getSide() ) ) { this.lastRedstone = !this.lastRedstone; if( this.lastRedstone && this.getRSMode() == RedstoneMode.SIGNAL_PULSE ) @@ -95,7 +95,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid protected InventoryAdaptor getHandler() { final TileEntity self = this.getHost().getTile(); - final TileEntity target = this.getTileEntity( self, self.xCoord + this.side.offsetX, self.yCoord + this.side.offsetY, self.zCoord + this.side.offsetZ ); + final TileEntity target = this.getTileEntity( self, self.xCoord + this.getSide().offsetX, self.yCoord + this.getSide().offsetY, self.zCoord + this.getSide().offsetZ ); final int newAdaptorHash = Platform.generateTileHash( target ); @@ -105,14 +105,14 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid } this.adaptorHash = newAdaptorHash; - this.adaptor = InventoryAdaptor.getAdaptor( target, this.side.getOpposite() ); + this.adaptor = InventoryAdaptor.getAdaptor( target, this.getSide().getOpposite() ); return this.adaptor; } protected int availableSlots() { - return Math.min( 1 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 4, this.config.getSizeInventory() ); + return Math.min( 1 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 4, this.getConfig().getSizeInventory() ); } protected int calculateItemsToSend() @@ -144,8 +144,8 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid { final TileEntity self = this.getHost().getTile(); final World world = self.getWorldObj(); - final int xCoordinate = self.xCoord + this.side.offsetX; - final int zCoordinate = self.zCoord + this.side.offsetZ; + final int xCoordinate = self.xCoord + this.getSide().offsetX; + final int zCoordinate = self.zCoord + this.getSide().offsetZ; return world != null && world.getChunkProvider().chunkExists( xCoordinate >> 4, zCoordinate >> 4 ); } @@ -156,11 +156,11 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid { if( !this.isSleeping() ) { - this.proxy.getTick().wakeDevice( this.proxy.getNode() ); + this.getProxy().getTick().wakeDevice( this.getProxy().getNode() ); } else { - this.proxy.getTick().sleepDevice( this.proxy.getNode() ); + this.getProxy().getTick().sleepDevice( this.getProxy().getNode() ); } } catch( final GridAccessException e ) @@ -182,4 +182,9 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid } protected abstract TickRateModulation doBusWork(); + + AppEngInternalAEInventory getConfig() + { + return this.config; + } } diff --git a/src/main/java/appeng/parts/automation/PartUpgradeable.java b/src/main/java/appeng/parts/automation/PartUpgradeable.java index 33b646ed..5cfe8bf7 100644 --- a/src/main/java/appeng/parts/automation/PartUpgradeable.java +++ b/src/main/java/appeng/parts/automation/PartUpgradeable.java @@ -42,7 +42,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn public PartUpgradeable( final ItemStack is ) { super( is ); - this.upgrades = new StackUpgradeInventory( this.is, this, this.getUpgradeSlots() ); + this.upgrades = new StackUpgradeInventory( this.getItemStack(), this, this.getUpgradeSlots() ); this.upgrades.setMaxStackSize( 1 ); this.manager = new ConfigManager( this ); } @@ -82,7 +82,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn return false; case HIGH_SIGNAL: - if( this.host.hasRedstone( this.side ) ) + if( this.getHost().hasRedstone( this.getSide() ) ) { return false; } @@ -90,7 +90,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn break; case LOW_SIGNAL: - if( !this.host.hasRedstone( this.side ) ) + if( !this.getHost().hasRedstone( this.getSide() ) ) { return false; } diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java index 9ab39b89..0f52bfeb 100644 --- a/src/main/java/appeng/parts/automation/UpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java @@ -47,7 +47,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement public UpgradeInventory( final IAEAppEngInventory parent, final int s ) { super( null, s ); - this.te = this; + this.setTileEntity( this ); this.parent = parent; } diff --git a/src/main/java/appeng/parts/layers/InvLayerData.java b/src/main/java/appeng/parts/layers/InvLayerData.java index 14382238..4117d275 100644 --- a/src/main/java/appeng/parts/layers/InvLayerData.java +++ b/src/main/java/appeng/parts/layers/InvLayerData.java @@ -44,7 +44,7 @@ public class InvLayerData this.slots = c; } - public ItemStack decreaseStackSize( final int slot, final int amount ) + ItemStack decreaseStackSize( final int slot, final int amount ) { if( this.isSlotValid( slot ) ) { @@ -61,12 +61,12 @@ public class InvLayerData * * @return true, if the slot exists. */ - boolean isSlotValid( final int slot ) + private boolean isSlotValid( final int slot ) { return this.slots != null && slot >= 0 && slot < this.slots.size(); } - public int getSizeInventory() + int getSizeInventory() { if( this.slots == null ) { @@ -76,7 +76,7 @@ public class InvLayerData return this.slots.size(); } - public ItemStack getStackInSlot( final int slot ) + ItemStack getStackInSlot( final int slot ) { if( this.isSlotValid( slot ) ) { @@ -86,7 +86,7 @@ public class InvLayerData return null; } - public boolean isItemValidForSlot( final int slot, final ItemStack itemstack ) + boolean isItemValidForSlot( final int slot, final ItemStack itemstack ) { if( this.isSlotValid( slot ) ) { @@ -96,7 +96,7 @@ public class InvLayerData return false; } - public void setInventorySlotContents( final int slot, final ItemStack itemstack ) + void setInventorySlotContents( final int slot, final ItemStack itemstack ) { if( this.isSlotValid( slot ) ) { @@ -104,7 +104,7 @@ public class InvLayerData } } - public boolean canExtractItem( final int slot, final ItemStack itemstack, final int side ) + boolean canExtractItem( final int slot, final ItemStack itemstack, final int side ) { if( this.isSlotValid( slot ) ) { @@ -114,7 +114,7 @@ public class InvLayerData return false; } - public boolean canInsertItem( final int slot, final ItemStack itemstack, final int side ) + boolean canInsertItem( final int slot, final ItemStack itemstack, final int side ) { if( this.isSlotValid( slot ) ) { @@ -124,7 +124,7 @@ public class InvLayerData return false; } - public void markDirty() + void markDirty() { if( this.inventories != null ) { @@ -135,7 +135,7 @@ public class InvLayerData } } - public int[] getAccessibleSlotsFromSide( final int side ) + int[] getAccessibleSlotsFromSide( final int side ) { if( this.sides == null || side < 0 || side > 5 ) { diff --git a/src/main/java/appeng/parts/layers/InvSot.java b/src/main/java/appeng/parts/layers/InvSot.java index 7ec5647c..7cc84985 100644 --- a/src/main/java/appeng/parts/layers/InvSot.java +++ b/src/main/java/appeng/parts/layers/InvSot.java @@ -26,8 +26,8 @@ import net.minecraft.item.ItemStack; public class InvSot { - public final ISidedInventory partInv; - public final int index; + private final ISidedInventory partInv; + private final int index; public InvSot( final ISidedInventory part, final int slot ) { @@ -35,32 +35,32 @@ public class InvSot this.index = slot; } - public ItemStack decreaseStackSize( final int j ) + ItemStack decreaseStackSize( final int j ) { return this.partInv.decrStackSize( this.index, j ); } - public ItemStack getStackInSlot() + ItemStack getStackInSlot() { return this.partInv.getStackInSlot( this.index ); } - public boolean isItemValidForSlot( final ItemStack itemstack ) + boolean isItemValidForSlot( final ItemStack itemstack ) { return this.partInv.isItemValidForSlot( this.index, itemstack ); } - public void setInventorySlotContents( final ItemStack itemstack ) + void setInventorySlotContents( final ItemStack itemstack ) { this.partInv.setInventorySlotContents( this.index, itemstack ); } - public boolean canExtractItem( final ItemStack itemstack, final int side ) + boolean canExtractItem( final ItemStack itemstack, final int side ) { return this.partInv.canExtractItem( this.index, itemstack, side ); } - public boolean canInsertItem( final ItemStack itemstack, final int side ) + boolean canInsertItem( final ItemStack itemstack, final int side ) { return this.partInv.canInsertItem( this.index, itemstack, side ); } diff --git a/src/main/java/appeng/parts/layers/LayerIFluidHandler.java b/src/main/java/appeng/parts/layers/LayerIFluidHandler.java index d989d775..25f0bea9 100644 --- a/src/main/java/appeng/parts/layers/LayerIFluidHandler.java +++ b/src/main/java/appeng/parts/layers/LayerIFluidHandler.java @@ -31,7 +31,7 @@ import appeng.api.parts.LayerBase; public class LayerIFluidHandler extends LayerBase implements IFluidHandler { - static final FluidTankInfo[] EMPTY_LIST = new FluidTankInfo[0]; + private static final FluidTankInfo[] EMPTY_LIST = new FluidTankInfo[0]; @Override public int fill( final ForgeDirection from, final FluidStack resource, final boolean doFill ) diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index 4ce6d6f1..37b8d42b 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -50,7 +50,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory // a simple empty array for empty stuff.. private static final int[] NULL_SIDES = {}; - InvLayerData invLayer = null; + private InvLayerData invLayer = null; /** * Recalculate inventory wrapper cache. diff --git a/src/main/java/appeng/parts/misc/PartCableAnchor.java b/src/main/java/appeng/parts/misc/PartCableAnchor.java index 0ff0c637..52efea72 100644 --- a/src/main/java/appeng/parts/misc/PartCableAnchor.java +++ b/src/main/java/appeng/parts/misc/PartCableAnchor.java @@ -53,10 +53,10 @@ import appeng.api.parts.PartItemStack; public class PartCableAnchor implements IPart { - protected ISimplifiedBundle renderCache = null; - ItemStack is = null; - IPartHost host = null; - ForgeDirection mySide = ForgeDirection.UP; + private ISimplifiedBundle renderCache = null; + private ItemStack is = null; + private IPartHost host = null; + private ForgeDirection mySide = ForgeDirection.UP; public PartCableAnchor( final ItemStack is ) { diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index fac7d0ad..96d1cc9a 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -76,7 +76,7 @@ import appeng.util.inv.IInventoryDestination; public class PartInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, ISidedInventory, IAEAppEngInventory, ITileStorageMonitorable, IPriorityHost { - final DualityInterface duality = new DualityInterface( this.proxy, this ); + private final DualityInterface duality = new DualityInterface( this.getProxy(), this ); @Reflected public PartInterface( final ItemStack is ) @@ -113,7 +113,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); @@ -135,18 +135,18 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.renderBlock( x, y, z, renderer ); @@ -209,7 +209,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto if( Platform.isServer() ) { - Platform.openGUI( p, this.getTileEntity(), this.side, GuiBridge.GUI_INTERFACE ); + Platform.openGUI( p, this.getTileEntity(), this.getSide(), GuiBridge.GUI_INTERFACE ); } return true; @@ -218,7 +218,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public IIcon getBreakingTexture() { - return this.is.getIconIndex(); + return this.getItemStack().getIconIndex(); } @Override @@ -362,7 +362,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto @Override public EnumSet getTargets() { - return EnumSet.of( this.side ); + return EnumSet.of( this.getSide() ); } @Override diff --git a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java b/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java index 986a4139..d2fc5d05 100644 --- a/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartInvertedToggleBus.java @@ -30,10 +30,10 @@ public class PartInvertedToggleBus extends PartToggleBus public PartInvertedToggleBus( final ItemStack is ) { super( is ); - this.proxy.setIdlePowerUsage( 0.0 ); - this.outerProxy.setIdlePowerUsage( 0.0 ); - this.proxy.setFlags(); - this.outerProxy.setFlags(); + this.getProxy().setIdlePowerUsage( 0.0 ); + this.getOuterProxy().setIdlePowerUsage( 0.0 ); + this.getProxy().setFlags(); + this.getOuterProxy().setFlags(); } @Override diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index bf5a4b8b..6b1eb379 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -94,14 +94,14 @@ import appeng.util.prioitylist.PrecisePriorityList; @Interface( iname = IntegrationType.BuildCraftTransport, iface = "buildcraft.api.transport.IPipeConnection" ) public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPipeConnection, IPriorityHost { - final BaseActionSource mySrc; - final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 ); - int priority = 0; - boolean cached = false; - MEMonitorIInventory monitor = null; - MEInventoryHandler handler = null; - int handlerHash = 0; - boolean wasActive = false; + private final BaseActionSource mySrc; + private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 ); + private int priority = 0; + private boolean cached = false; + private MEMonitorIInventory monitor = null; + private MEInventoryHandler handler = null; + private int handlerHash = 0; + private boolean wasActive = false; private byte resetCacheLogic = 0; @Reflected @@ -123,14 +123,14 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC private void updateStatus() { - final boolean currentActive = this.proxy.isActive(); + final boolean currentActive = this.getProxy().isActive(); if( this.wasActive != currentActive ) { this.wasActive = currentActive; try { - this.proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); - this.host.markForUpdate(); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getHost().markForUpdate(); } catch( final GridAccessException e ) { @@ -155,7 +155,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) { this.resetCache( true ); - this.host.markForSave(); + this.getHost().markForSave(); } @Override @@ -205,7 +205,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC private void resetCache( final boolean fullReset ) { - if( this.host == null || this.host.getTile() == null || this.host.getTile().getWorldObj() == null || this.host.getTile().getWorldObj().isRemote ) + if( this.getHost() == null || this.getHost().getTile() == null || this.getHost().getTile().getWorldObj() == null || this.getHost().getTile().getWorldObj().isRemote ) { return; } @@ -221,7 +221,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC try { - this.proxy.getTick().alertDevice( this.proxy.getNode() ); + this.getProxy().getTick().alertDevice( this.getProxy().getNode() ); } catch( final GridAccessException e ) { @@ -240,9 +240,9 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { try { - if( this.proxy.isActive() ) + if( this.getProxy().isActive() ) { - this.proxy.getStorage().postAlterationOfStoredItems( StorageChannel.ITEMS, change, this.mySrc ); + this.getProxy().getStorage().postAlterationOfStoredItems( StorageChannel.ITEMS, change, this.mySrc ); } } catch( final GridAccessException e ) @@ -269,7 +269,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @SideOnly( Side.CLIENT ) public void renderInventory( final IPartRenderHelper rh, final RenderBlocks renderer ) { - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderInventoryBox( renderer ); @@ -285,8 +285,8 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 3, 3, 15, 13, 13, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -294,12 +294,12 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC rh.setBounds( 2, 2, 14, 14, 14, 15 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); + rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); rh.setBounds( 5, 5, 12, 11, 11, 13 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 5, 5, 13, 11, 11, 14 ); rh.renderBlock( x, y, z, renderer ); @@ -329,7 +329,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_STORAGEBUS ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_STORAGEBUS ); return true; } @@ -339,7 +339,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.StorageBus.min, TickRates.StorageBus.max, this.monitor == null, true ); + return new TickingRequest( TickRates.StorageBus.getMin(), TickRates.StorageBus.getMax(), this.monitor == null, true ); } @Override @@ -403,7 +403,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC this.cached = true; final TileEntity self = this.getHost().getTile(); - final TileEntity target = self.getWorldObj().getTileEntity( self.xCoord + this.side.offsetX, self.yCoord + this.side.offsetY, self.zCoord + this.side.offsetZ ); + final TileEntity target = self.getWorldObj().getTileEntity( self.xCoord + this.getSide().offsetX, self.yCoord + this.getSide().offsetY, self.zCoord + this.getSide().offsetZ ); final int newHandlerHash = Platform.generateTileHash( target ); @@ -415,7 +415,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC try { // force grid to update handlers... - this.proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { @@ -427,16 +427,16 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC this.monitor = null; if( target != null ) { - final IExternalStorageHandler esh = AEApi.instance().registries().externalStorage().getHandler( target, this.side.getOpposite(), StorageChannel.ITEMS, this.mySrc ); + final IExternalStorageHandler esh = AEApi.instance().registries().externalStorage().getHandler( target, this.getSide().getOpposite(), StorageChannel.ITEMS, this.mySrc ); if( esh != null ) { - final IMEInventory inv = esh.getInventory( target, this.side.getOpposite(), StorageChannel.ITEMS, this.mySrc ); + final IMEInventory inv = esh.getInventory( target, this.getSide().getOpposite(), StorageChannel.ITEMS, this.mySrc ); if( inv instanceof MEMonitorIInventory ) { final MEMonitorIInventory h = (MEMonitorIInventory) inv; - h.mode = (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ); - h.mySource = new MachineSource( this ); + h.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) ); + h.setActionSource( new MachineSource( this ) ); } if( inv instanceof MEMonitorIInventory ) @@ -446,7 +446,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC if( inv != null ) { - this.checkInterfaceVsStorageBus( target, this.side.getOpposite() ); + this.checkInterfaceVsStorageBus( target, this.getSide().getOpposite() ); this.handler = new MEInventoryHandler( inv, StorageChannel.ITEMS ); @@ -488,14 +488,14 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { try { - final ITickManager tm = this.proxy.getTick(); + final ITickManager tm = this.getProxy().getTick(); if( this.monitor == null ) { - tm.sleepDevice( this.proxy.getNode() ); + tm.sleepDevice( this.getProxy().getNode() ); } else { - tm.wakeDevice( this.proxy.getNode() ); + tm.wakeDevice( this.getProxy().getNode() ); } } catch( final GridAccessException e ) @@ -537,7 +537,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC { if( channel == StorageChannel.ITEMS ) { - final IMEInventoryHandler out = this.proxy.isActive() ? this.getInternalHandler() : null; + final IMEInventoryHandler out = this.getProxy().isActive() ? this.getInternalHandler() : null; if( out != null ) { return Collections.singletonList( out ); @@ -556,7 +556,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC public void setPriority( final int newValue ) { this.priority = newValue; - this.host.markForSave(); + this.getHost().markForSave(); this.resetCache( true ); } @@ -569,7 +569,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @Method( iname = IntegrationType.BuildCraftTransport ) public ConnectOverride overridePipeConnection( final PipeType type, final ForgeDirection with ) { - return type == PipeType.ITEM && with == this.side ? ConnectOverride.CONNECT : ConnectOverride.DISCONNECT; + return type == PipeType.ITEM && with == this.getSide() ? ConnectOverride.CONNECT : ConnectOverride.DISCONNECT; } @Override diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 6576af8e..9fa4b495 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -54,25 +54,25 @@ import appeng.util.Platform; public class PartToggleBus extends PartBasicState { private static final int REDSTONE_FLAG = 4; - final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); - IGridConnection connection; - boolean hasRedstone = false; + private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); + private IGridConnection connection; + private boolean hasRedstone = false; @Reflected public PartToggleBus( final ItemStack is ) { super( is ); - this.proxy.setIdlePowerUsage( 0.0 ); - this.outerProxy.setIdlePowerUsage( 0.0 ); - this.proxy.setFlags(); - this.outerProxy.setFlags(); + this.getProxy().setIdlePowerUsage( 0.0 ); + this.getOuterProxy().setIdlePowerUsage( 0.0 ); + this.getProxy().setFlags(); + this.getOuterProxy().setFlags(); } @Override public void setColors( final boolean hasChan, final boolean hasPower ) { - this.hasRedstone = ( this.clientFlags & REDSTONE_FLAG ) == REDSTONE_FLAG; + this.hasRedstone = ( this.getClientFlags() & REDSTONE_FLAG ) == REDSTONE_FLAG; super.setColors( hasChan && this.hasRedstone, hasPower && this.hasRedstone ); } @@ -84,13 +84,13 @@ public class PartToggleBus extends PartBasicState protected boolean getIntention() { - return this.getHost().hasRedstone( this.side ); + return this.getHost().hasRedstone( this.getSide() ); } @Override public IIcon getBreakingTexture() { - return this.is.getIconIndex(); + return this.getItemStack().getIconIndex(); } @Override @@ -102,13 +102,13 @@ public class PartToggleBus extends PartBasicState @Override public void securityBreak() { - if( this.is.stackSize > 0 ) + if( this.getItemStack().stackSize > 0 ) { final List items = new ArrayList(); - items.add( this.is.copy() ); - this.host.removePart( this.side, false ); - Platform.spawnDrops( this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, items ); - this.is.stackSize = 0; + items.add( this.getItemStack().copy() ); + this.getHost().removePart( this.getSide(), false ); + Platform.spawnDrops( this.getTile().getWorldObj(), this.getTile().xCoord, this.getTile().yCoord, this.getTile().zCoord, items ); + this.getItemStack().stackSize = 0; } } @@ -124,7 +124,7 @@ public class PartToggleBus extends PartBasicState { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( this.is.getIconIndex() ); + rh.setTexture( this.getItemStack().getIconIndex() ); rh.setBounds( 6, 6, 14 - 4, 10, 10, 16 - 4 ); rh.renderInventoryBox( renderer ); @@ -147,8 +147,8 @@ public class PartToggleBus extends PartBasicState @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); - rh.setTexture( this.is.getIconIndex() ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); + rh.setTexture( this.getItemStack().getIconIndex() ); rh.setBounds( 6, 6, 14, 10, 10, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -156,7 +156,7 @@ public class PartToggleBus extends PartBasicState rh.setBounds( 6, 6, 11, 10, 10, 13 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.is.getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartMonitorSidesStatus.getIcon(), CableBusTextures.PartMonitorSidesStatus.getIcon() ); rh.setBounds( 6, 6, 13, 10, 10, 14 ); rh.renderBlock( x, y, z, renderer ); @@ -168,7 +168,7 @@ public class PartToggleBus extends PartBasicState public void onNeighborChanged() { final boolean oldHasRedstone = this.hasRedstone; - this.hasRedstone = this.getHost().hasRedstone( this.side ); + this.hasRedstone = this.getHost().hasRedstone( this.getSide() ); if( this.hasRedstone != oldHasRedstone ) { @@ -181,29 +181,29 @@ public class PartToggleBus extends PartBasicState public void readFromNBT( final NBTTagCompound extra ) { super.readFromNBT( extra ); - this.outerProxy.readFromNBT( extra ); + this.getOuterProxy().readFromNBT( extra ); } @Override public void writeToNBT( final NBTTagCompound extra ) { super.writeToNBT( extra ); - this.outerProxy.writeToNBT( extra ); + this.getOuterProxy().writeToNBT( extra ); } @Override public void removeFromWorld() { super.removeFromWorld(); - this.outerProxy.invalidate(); + this.getOuterProxy().invalidate(); } @Override public void addToWorld() { super.addToWorld(); - this.outerProxy.onReady(); - this.hasRedstone = this.getHost().hasRedstone( this.side ); + this.getOuterProxy().onReady(); + this.hasRedstone = this.getHost().hasRedstone( this.getSide() ); this.updateInternalState(); } @@ -211,13 +211,13 @@ public class PartToggleBus extends PartBasicState public void setPartHostInfo( final ForgeDirection side, final IPartHost host, final TileEntity tile ) { super.setPartHostInfo( side, host, tile ); - this.outerProxy.setValidSides( EnumSet.of( side ) ); + this.getOuterProxy().setValidSides( EnumSet.of( side ) ); } @Override public IGridNode getExternalFacingNode() { - return this.outerProxy.getNode(); + return this.getOuterProxy().getNode(); } @Override @@ -230,7 +230,7 @@ public class PartToggleBus extends PartBasicState public void onPlacement( final EntityPlayer player, final ItemStack held, final ForgeDirection side ) { super.onPlacement( player, held, side ); - this.outerProxy.setOwner( player ); + this.getOuterProxy().setOwner( player ); } private void updateInternalState() @@ -238,13 +238,13 @@ public class PartToggleBus extends PartBasicState final boolean intention = this.getIntention(); if( intention == ( this.connection == null ) ) { - if( this.proxy.getNode() != null && this.outerProxy.getNode() != null ) + if( this.getProxy().getNode() != null && this.getOuterProxy().getNode() != null ) { if( intention ) { try { - this.connection = AEApi.instance().createGridConnection( this.proxy.getNode(), this.outerProxy.getNode() ); + this.connection = AEApi.instance().createGridConnection( this.getProxy().getNode(), this.getOuterProxy().getNode() ); } catch( final FailedConnection e ) { @@ -259,4 +259,9 @@ public class PartToggleBus extends PartBasicState } } } + + AENetworkProxy getOuterProxy() + { + return this.outerProxy; + } } diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 12fd272d..dfcef8a6 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -61,7 +61,6 @@ import appeng.client.texture.FlippableIcon; import appeng.client.texture.TaughtIcon; import appeng.items.parts.ItemMultiPart; import appeng.me.GridAccessException; -import appeng.me.helpers.AENetworkProxy; import appeng.parts.AEBasePart; import appeng.util.Platform; @@ -69,17 +68,17 @@ import appeng.util.Platform; public class PartCable extends AEBasePart implements IPartCable { - final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 }; + private final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 }; - EnumSet connections = EnumSet.noneOf( ForgeDirection.class ); - boolean powered = false; + private EnumSet connections = EnumSet.noneOf( ForgeDirection.class ); + private boolean powered = false; public PartCable( final ItemStack is ) { super( is ); - this.proxy.setFlags( GridFlags.PREFERRED ); - this.proxy.setIdlePowerUsage( 0.0 ); - this.proxy.myColor = AEColor.values()[( (ItemMultiPart) is.getItem() ).variantOf( is.getItemDamage() )]; + this.getProxy().setFlags( GridFlags.PREFERRED ); + this.getProxy().setIdlePowerUsage( 0.0 ); + this.getProxy().setColor( AEColor.values()[( (ItemMultiPart) is.getItem() ).variantOf( is.getItemDamage() )] ); } @Override @@ -91,7 +90,7 @@ public class PartCable extends AEBasePart implements IPartCable @Override public AEColor getCableColor() { - return this.proxy.myColor; + return this.getProxy().getColor(); } @Override @@ -130,7 +129,7 @@ public class PartCable extends AEBasePart implements IPartCable try { - hasPermission = this.proxy.getSecurity().hasPermission( who, SecurityPermissions.BUILD ); + hasPermission = this.getProxy().getSecurity().hasPermission( who, SecurityPermissions.BUILD ); } catch( final GridAccessException e ) { @@ -155,13 +154,13 @@ public class PartCable extends AEBasePart implements IPartCable @Override public void setValidSides( final EnumSet sides ) { - this.proxy.setValidSides( sides ); + this.getProxy().setValidSides( sides ); } @Override public boolean isConnected( final ForgeDirection side ) { - return this.connections.contains( side ); + return this.getConnections().contains( side ); } public void markForUpdate() @@ -179,11 +178,11 @@ public class PartCable extends AEBasePart implements IPartCable final IGridNode n = this.getGridNode(); if( n != null ) { - this.connections = n.getConnectedSides(); + this.setConnections( n.getConnectedSides() ); } else { - this.connections.clear(); + this.getConnections().clear(); } } @@ -228,7 +227,7 @@ public class PartCable extends AEBasePart implements IPartCable } } - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { switch( of ) { @@ -317,17 +316,11 @@ public class PartCable extends AEBasePart implements IPartCable return glassCable.item( AEColor.Transparent ).getIconIndex( glassCableStack ); } - @Override - public AENetworkProxy getProxy() - { - return this.proxy; - } - @Override @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); boolean useCovered = false; boolean requireDetailed = false; @@ -344,9 +337,9 @@ public class PartCable extends AEBasePart implements IPartCable break; } } - else if( this.connections.contains( dir ) ) + else if( this.getConnections().contains( dir ) ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null; if( partHost == null && gh != null && gh.getCableConnectionType( dir ) != AECableType.GLASS ) @@ -366,7 +359,7 @@ public class PartCable extends AEBasePart implements IPartCable } final IPartHost ph = this.getHost(); - for( final ForgeDirection of : EnumSet.complementOf( this.connections ) ) + for( final ForgeDirection of : EnumSet.complementOf( this.getConnections() ) ) { final IPart bp = ph.getPart( of ); if( bp instanceof IGridHost ) @@ -402,7 +395,7 @@ public class PartCable extends AEBasePart implements IPartCable } } - if( this.connections.size() != 2 || !this.nonLinear( this.connections ) || useCovered || requireDetailed ) + if( this.getConnections().size() != 2 || !this.nonLinear( this.getConnections() ) || useCovered || requireDetailed ) { if( useCovered ) { @@ -415,7 +408,7 @@ public class PartCable extends AEBasePart implements IPartCable rh.renderBlock( x, y, z, renderer ); } - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { this.renderGlassConnection( x, y, z, rh, renderer, of ); } @@ -425,7 +418,7 @@ public class PartCable extends AEBasePart implements IPartCable final IIcon def = this.getTexture( this.getCableColor() ); rh.setTexture( def ); - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of, of.getOpposite() ) ) ); switch( of ) @@ -497,7 +490,7 @@ public class PartCable extends AEBasePart implements IPartCable final IReadOnlyCollection set = part.getGridNode().getConnections(); for( final IGridConnection gc : set ) { - if( this.proxy.getNode().hasFlag( GridFlags.DENSE_CAPACITY ) && gc.getOtherSide( this.proxy.getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ) ) + if( this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY ) && gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ) ) { sideOut |= ( gc.getUsedChannels() / 4 ) << ( 4 * thisSide.ordinal() ); } @@ -515,8 +508,8 @@ public class PartCable extends AEBasePart implements IPartCable final ForgeDirection side = gc.getDirection( n ); if( side != ForgeDirection.UNKNOWN ) { - final boolean isTier2a = this.proxy.getNode().hasFlag( GridFlags.DENSE_CAPACITY ); - final boolean isTier2b = gc.getOtherSide( this.proxy.getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ); + final boolean isTier2a = this.getProxy().getNode().hasFlag( GridFlags.DENSE_CAPACITY ); + final boolean isTier2b = gc.getOtherSide( this.getProxy().getNode() ).hasFlag( GridFlags.DENSE_CAPACITY ); if( isTier2a && isTier2b ) { @@ -533,7 +526,7 @@ public class PartCable extends AEBasePart implements IPartCable try { - if( this.proxy.getEnergy().isNetworkPowered() ) + if( this.getProxy().getEnergy().isNetworkPowered() ) { cs |= ( 1 << ForgeDirection.UNKNOWN.ordinal() ); } @@ -553,7 +546,7 @@ public class PartCable extends AEBasePart implements IPartCable final int cs = data.readByte(); final int sideOut = data.readInt(); - final EnumSet myC = this.connections.clone(); + final EnumSet myC = this.getConnections().clone(); final boolean wasPowered = this.powered; this.powered = false; boolean channelsChanged = false; @@ -563,10 +556,10 @@ public class PartCable extends AEBasePart implements IPartCable if( d != ForgeDirection.UNKNOWN ) { final int ch = ( sideOut >> ( d.ordinal() * 4 ) ) & 0xF; - if( ch != this.channelsOnSide[d.ordinal()] ) + if( ch != this.getChannelsOnSide()[d.ordinal()] ) { channelsChanged = true; - this.channelsOnSide[d.ordinal()] = ch; + this.getChannelsOnSide()[d.ordinal()] = ch; } } @@ -583,16 +576,16 @@ public class PartCable extends AEBasePart implements IPartCable final int id = 1 << d.ordinal(); if( id == ( cs & id ) ) { - this.connections.add( d ); + this.getConnections().add( d ); } else { - this.connections.remove( d ); + this.getConnections().remove( d ); } } } - return !myC.equals( this.connections ) || wasPowered != this.powered || channelsChanged; + return !myC.equals( this.getConnections() ) || wasPowered != this.powered || channelsChanged; } @Override @@ -653,9 +646,9 @@ public class PartCable extends AEBasePart implements IPartCable } @SideOnly( Side.CLIENT ) - public void renderGlassConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final ForgeDirection of ) + private void renderGlassConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost gh = te instanceof IGridHost ? (IGridHost) te : null; @@ -728,10 +721,9 @@ public class PartCable extends AEBasePart implements IPartCable rh.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) ); } - @SideOnly( Side.CLIENT ) - public void renderCoveredConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) + @SideOnly( Side.CLIENT ) void renderCoveredConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null; @@ -809,10 +801,9 @@ public class PartCable extends AEBasePart implements IPartCable rh.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) ); } - @SideOnly( Side.CLIENT ) - public void renderSmartConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) + @SideOnly( Side.CLIENT ) void renderSmartConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null; AEColor myColor = this.getCableColor(); @@ -934,7 +925,7 @@ public class PartCable extends AEBasePart implements IPartCable } } - public IIcon getSmartTexture( final AEColor c ) + IIcon getSmartTexture( final AEColor c ) { switch( c ) { @@ -1065,4 +1056,19 @@ public class PartCable extends AEBasePart implements IPartCable rh.renderFace( x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.DOWN ), ForgeDirection.DOWN, renderer ); rh.renderFace( x, y, z, blk.getRendererInstance().getTexture( ForgeDirection.UP ), ForgeDirection.UP, renderer ); } + + int[] getChannelsOnSide() + { + return this.channelsOnSide; + } + + EnumSet getConnections() + { + return this.connections; + } + + void setConnections( final EnumSet connections ) + { + this.connections = connections; + } } diff --git a/src/main/java/appeng/parts/networking/PartCableCovered.java b/src/main/java/appeng/parts/networking/PartCableCovered.java index 8eb88543..c7e815c1 100644 --- a/src/main/java/appeng/parts/networking/PartCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartCableCovered.java @@ -83,15 +83,15 @@ public class PartCableCovered extends PartCable final IGridNode n = this.getGridNode(); if( n != null ) { - this.connections = n.getConnectedSides(); + this.setConnections( n.getConnectedSides() ); } else { - this.connections.clear(); + this.getConnections().clear(); } } - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { switch( of ) { @@ -164,14 +164,14 @@ public class PartCableCovered extends PartCable @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); rh.setTexture( this.getTexture( this.getCableColor() ) ); - final EnumSet sides = this.connections.clone(); + final EnumSet sides = this.getConnections().clone(); boolean hasBuses = false; final IPartHost ph = this.getHost(); - for( final ForgeDirection of : EnumSet.complementOf( this.connections ) ) + for( final ForgeDirection of : EnumSet.complementOf( this.getConnections() ) ) { final IPart bp = ph.getPart( of ); if( bp instanceof IGridHost ) @@ -215,9 +215,9 @@ public class PartCableCovered extends PartCable if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses ) { - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { - this.renderCoveredConnection( x, y, z, rh, renderer, this.channelsOnSide[of.ordinal()], of ); + this.renderCoveredConnection( x, y, z, rh, renderer, this.getChannelsOnSide()[of.ordinal()], of ); } rh.setTexture( this.getTexture( this.getCableColor() ) ); @@ -228,7 +228,7 @@ public class PartCableCovered extends PartCable { final IIcon def = this.getTexture( this.getCableColor() ); final IIcon off = new OffsetIcon( def, 0, -12 ); - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { switch( of ) { diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/PartCableSmart.java index 06b39868..97918b64 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartCableSmart.java @@ -87,15 +87,15 @@ public class PartCableSmart extends PartCable final IGridNode n = this.getGridNode(); if( n != null ) { - this.connections = n.getConnectedSides(); + this.setConnections( n.getConnectedSides() ); } else { - this.connections.clear(); + this.getConnections().clear(); } } - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { switch( of ) { @@ -182,14 +182,14 @@ public class PartCableSmart extends PartCable @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); rh.setTexture( this.getTexture( this.getCableColor() ) ); - final EnumSet sides = this.connections.clone(); + final EnumSet sides = this.getConnections().clone(); boolean hasBuses = false; final IPartHost ph = this.getHost(); - for( final ForgeDirection of : EnumSet.complementOf( this.connections ) ) + for( final ForgeDirection of : EnumSet.complementOf( this.getConnections() ) ) { final IPart bp = ph.getPart( of ); if( bp instanceof IGridHost ) @@ -229,8 +229,8 @@ public class PartCableSmart extends PartCable rh.renderBlock( x, y, z, renderer ); this.setSmartConnectionRotations( of, renderer ); - final IIcon firstIcon = new TaughtIcon( this.getChannelTex( this.channelsOnSide[of.ordinal()], false ).getIcon(), -0.2f ); - final IIcon secondIcon = new TaughtIcon( this.getChannelTex( this.channelsOnSide[of.ordinal()], true ).getIcon(), -0.2f ); + final IIcon firstIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide()[of.ordinal()], false ).getIcon(), -0.2f ); + final IIcon secondIcon = new TaughtIcon( this.getChannelTex( this.getChannelsOnSide()[of.ordinal()], true ).getIcon(), -0.2f ); if( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { @@ -257,9 +257,9 @@ public class PartCableSmart extends PartCable if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses ) { - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { - this.renderSmartConnection( x, y, z, rh, renderer, this.channelsOnSide[of.ordinal()], of ); + this.renderSmartConnection( x, y, z, rh, renderer, this.getChannelsOnSide()[of.ordinal()], of ); } rh.setTexture( this.getCoveredTexture( this.getCableColor() ) ); @@ -270,13 +270,13 @@ public class PartCableSmart extends PartCable { ForgeDirection selectedSide = ForgeDirection.UNKNOWN; - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { selectedSide = of; break; } - final int channels = this.channelsOnSide[selectedSide.ordinal()]; + final int channels = this.getChannelsOnSide()[selectedSide.ordinal()]; final IIcon def = this.getTexture( this.getCableColor() ); final IIcon off = new OffsetIcon( def, 0, -12 ); diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 2b50f85b..13d95d4c 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -62,7 +62,7 @@ public class PartDenseCable extends PartCable { super( is ); - this.proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED ); + this.getProxy().setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED ); } @Override @@ -91,15 +91,15 @@ public class PartDenseCable extends PartCable final IGridNode n = this.getGridNode(); if( n != null ) { - this.connections = n.getConnectedSides(); + this.setConnections( n.getConnectedSides() ); } else { - this.connections.clear(); + this.getConnections().clear(); } } - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { if( this.isDense( of ) ) { @@ -217,13 +217,13 @@ public class PartDenseCable extends PartCable @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); rh.setTexture( this.getTexture( this.getCableColor() ) ); - final EnumSet sides = this.connections.clone(); + final EnumSet sides = this.getConnections().clone(); boolean hasBuses = false; - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { if( !this.isDense( of ) ) { @@ -233,19 +233,19 @@ public class PartDenseCable extends PartCable if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses ) { - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { if( this.isDense( of ) ) { - this.renderDenseConnection( x, y, z, rh, renderer, this.channelsOnSide[of.ordinal()], of ); + this.renderDenseConnection( x, y, z, rh, renderer, this.getChannelsOnSide()[of.ordinal()], of ); } else if( this.isSmart( of ) ) { - this.renderSmartConnection( x, y, z, rh, renderer, this.channelsOnSide[of.ordinal()], of ); + this.renderSmartConnection( x, y, z, rh, renderer, this.getChannelsOnSide()[of.ordinal()], of ); } else { - this.renderCoveredConnection( x, y, z, rh, renderer, this.channelsOnSide[of.ordinal()], of ); + this.renderCoveredConnection( x, y, z, rh, renderer, this.getChannelsOnSide()[of.ordinal()], of ); } } @@ -257,13 +257,13 @@ public class PartDenseCable extends PartCable { ForgeDirection selectedSide = ForgeDirection.UNKNOWN; - for( final ForgeDirection of : this.connections ) + for( final ForgeDirection of : this.getConnections() ) { selectedSide = of; break; } - final int channels = this.channelsOnSide[selectedSide.ordinal()]; + final int channels = this.getChannelsOnSide()[selectedSide.ordinal()]; final IIcon def = this.getTexture( this.getCableColor() ); final IIcon off = new OffsetIcon( def, 0, -12 ); @@ -360,9 +360,9 @@ public class PartDenseCable extends PartCable } @SideOnly( Side.CLIENT ) - public void renderDenseConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) + private void renderDenseConnection( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer, final int channels, final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ ); final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null; final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null; AEColor myColor = this.getCableColor(); @@ -456,7 +456,7 @@ public class PartDenseCable extends PartCable private boolean isSmart( final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( this.tile.xCoord + of.offsetX, this.tile.yCoord + of.offsetY, this.tile.zCoord + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( this.getTile().xCoord + of.offsetX, this.getTile().yCoord + of.offsetY, this.getTile().zCoord + of.offsetZ ); if( te instanceof IGridHost ) { final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() ); @@ -504,12 +504,12 @@ public class PartDenseCable extends PartCable default: } - return this.is.getIconIndex(); + return this.getItemStack().getIconIndex(); } private boolean isDense( final ForgeDirection of ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( this.tile.xCoord + of.offsetX, this.tile.yCoord + of.offsetY, this.tile.zCoord + of.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( this.getTile().xCoord + of.offsetX, this.getTile().yCoord + of.offsetY, this.getTile().zCoord + of.offsetZ ); if( te instanceof IGridHost ) { final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() ); diff --git a/src/main/java/appeng/parts/networking/PartQuartzFiber.java b/src/main/java/appeng/parts/networking/PartQuartzFiber.java index df175597..c1994d83 100644 --- a/src/main/java/appeng/parts/networking/PartQuartzFiber.java +++ b/src/main/java/appeng/parts/networking/PartQuartzFiber.java @@ -52,13 +52,13 @@ import appeng.parts.AEBasePart; public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider { - final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", this.proxy.getMachineRepresentation(), true ); + private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", this.getProxy().getMachineRepresentation(), true ); public PartQuartzFiber( final ItemStack is ) { super( is ); - this.proxy.setIdlePowerUsage( 0 ); - this.proxy.setFlags( GridFlags.CANNOT_CARRY ); + this.getProxy().setIdlePowerUsage( 0 ); + this.getProxy().setFlags( GridFlags.CANNOT_CARRY ); this.outerProxy.setIdlePowerUsage( 0 ); this.outerProxy.setFlags( GridFlags.CANNOT_CARRY ); } @@ -81,7 +81,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider { GL11.glTranslated( -0.2, -0.3, 0.0 ); - rh.setTexture( this.is.getIconIndex() ); + rh.setTexture( this.getItemStack().getIconIndex() ); rh.setBounds( 6.0f, 6.0f, 5.0f, 10.0f, 10.0f, 11.0f ); rh.renderInventoryBox( renderer ); rh.setTexture( null ); @@ -91,7 +91,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - final IIcon myIcon = this.is.getIconIndex(); + final IIcon myIcon = this.getItemStack().getIconIndex(); rh.setTexture( myIcon ); rh.setBounds( 6, 6, 10, 10, 10, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -159,7 +159,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider try { - final IEnergyGrid eg = this.proxy.getEnergy(); + final IEnergyGrid eg = this.getProxy().getEnergy(); acquiredPower += eg.extractAEPower( amt - acquiredPower, mode, seen ); } catch( final GridAccessException e ) @@ -186,7 +186,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider try { - final IEnergyGrid eg = this.proxy.getEnergy(); + final IEnergyGrid eg = this.getProxy().getEnergy(); if( !seen.contains( eg ) ) { return eg.injectAEPower( amt, mode, seen ); @@ -220,7 +220,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider try { - final IEnergyGrid eg = this.proxy.getEnergy(); + final IEnergyGrid eg = this.getProxy().getEnergy(); demand += eg.getEnergyDemand( amt - demand, seen ); } catch( final GridAccessException e ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index d1151064..c74a4467 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -45,11 +45,11 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i { // two packet buffering... - double OutputEnergyA; - double OutputEnergyB; + private double OutputEnergyA; + private double OutputEnergyB; // two packet buffering... - double OutputVoltageA; - double OutputVoltageB; + private double OutputVoltageA; + private double OutputVoltageB; public PartP2PIC2Power( final ItemStack is ) { @@ -98,9 +98,9 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i @Override public boolean acceptsEnergyFrom( final TileEntity emitter, final ForgeDirection direction ) { - if( !this.output ) + if( !this.isOutput() ) { - return direction == this.side; + return direction == this.getSide(); } return false; } @@ -108,9 +108,9 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i @Override public boolean emitsEnergyTo( final TileEntity receiver, final ForgeDirection direction ) { - if( this.output ) + if( this.isOutput() ) { - return direction == this.side; + return direction == this.getSide(); } return false; } @@ -118,7 +118,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i @Override public double getDemandedEnergy() { - if( this.output ) + if( this.isOutput() ) { return 0; } @@ -227,7 +227,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i @Override public double getOfferedEnergy() { - if( this.output ) + if( this.isOutput() ) { return this.OutputEnergyA; } @@ -251,7 +251,7 @@ public class PartP2PIC2Power extends PartP2PTunnel implements i @Override public int getSourceTier() { - if( this.output ) + if( this.isOutput() ) { return this.calculateTierFromVoltage( this.OutputVoltageA ); } diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 6081e588..2e5a7139 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -65,10 +65,10 @@ import appeng.util.inv.WrapperMCISidedInventory; public class PartP2PItems extends PartP2PTunnel implements IPipeConnection, ISidedInventory, IGridTickable { - final LinkedList which = new LinkedList(); - int oldSize = 0; - boolean requested; - IInventory cachedInv; + private final LinkedList which = new LinkedList(); + private int oldSize = 0; + private boolean requested; + private IInventory cachedInv; public PartP2PItems( final ItemStack is ) { @@ -80,13 +80,13 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { this.cachedInv = null; final PartP2PItems input = this.getInput(); - if( input != null && this.output ) + if( input != null && this.isOutput() ) { input.onTunnelNetworkChange(); } } - IInventory getDestination() + private IInventory getDestination() { this.requested = true; @@ -126,13 +126,13 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo return this.cachedInv = new WrapperChainedInventory( outs ); } - IInventory getOutputInv() + private IInventory getOutputInv() { IInventory output = null; - if( this.proxy.isActive() ) + if( this.getProxy().isActive() ) { - final TileEntity te = this.tile.getWorldObj().getTileEntity( this.tile.xCoord + this.side.offsetX, this.tile.yCoord + this.side.offsetY, this.tile.zCoord + this.side.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( this.getTile().xCoord + this.getSide().offsetX, this.getTile().yCoord + this.getSide().offsetY, this.getTile().zCoord + this.getSide().offsetZ ); if( this.which.contains( this ) ) { @@ -144,11 +144,11 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.BuildCraftTransport ) ) { final IBuildCraftTransport buildcraft = (IBuildCraftTransport) IntegrationRegistry.INSTANCE.getInstance( IntegrationType.BuildCraftTransport ); - if( buildcraft.isPipe( te, this.side.getOpposite() ) ) + if( buildcraft.isPipe( te, this.getSide().getOpposite() ) ) { try { - output = new WrapperBCPipe( te, this.side.getOpposite() ); + output = new WrapperBCPipe( te, this.getSide().getOpposite() ); } catch( final Throwable ignore ) { @@ -170,7 +170,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo } else if( te instanceof ISidedInventory ) { - output = new WrapperMCISidedInventory( (ISidedInventory) te, this.side.getOpposite() ); + output = new WrapperMCISidedInventory( (ISidedInventory) te, this.getSide().getOpposite() ); } else if( te instanceof IInventory ) { @@ -187,7 +187,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.ItemTunnel.min, TickRates.ItemTunnel.max, false, false ); + return new TickingRequest( TickRates.ItemTunnel.getMin(), TickRates.ItemTunnel.getMax(), false, false ); } @Override @@ -207,7 +207,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @MENetworkEventSubscribe public void changeStateA( final MENetworkBootingStatusChange bs ) { - if( !this.output ) + if( !this.isOutput() ) { this.cachedInv = null; final int olderSize = this.oldSize; @@ -222,7 +222,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @MENetworkEventSubscribe public void changeStateB( final MENetworkChannelsChanged bs ) { - if( !this.output ) + if( !this.isOutput() ) { this.cachedInv = null; final int olderSize = this.oldSize; @@ -237,7 +237,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @MENetworkEventSubscribe public void changeStateC( final MENetworkPowerStatusChange bs ) { - if( !this.output ) + if( !this.isOutput() ) { this.cachedInv = null; final int olderSize = this.oldSize; @@ -259,7 +259,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Override public void onTunnelNetworkChange() { - if( !this.output ) + if( !this.isOutput() ) { this.cachedInv = null; final int olderSize = this.oldSize; @@ -387,6 +387,6 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo @Method( iname = IntegrationType.BuildCraftTransport ) public ConnectOverride overridePipeConnection( final PipeType type, final ForgeDirection with ) { - return this.side == with && type == PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT; + return this.getSide() == with && type == PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT; } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PLight.java b/src/main/java/appeng/parts/p2p/PartP2PLight.java index bd98d97c..457bf2d7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLight.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLight.java @@ -46,8 +46,8 @@ import appeng.me.GridAccessException; public class PartP2PLight extends PartP2PTunnel implements IGridTickable { - int lastValue = 0; - float opacity = -1; + private int lastValue = 0; + private float opacity = -1; public PartP2PLight( final ItemStack is ) { @@ -72,7 +72,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi public void writeToStream( final ByteBuf data ) throws IOException { super.writeToStream( data ); - data.writeInt( this.output ? this.lastValue : 0 ); + data.writeInt( this.isOutput() ? this.lastValue : 0 ); } @Override @@ -80,13 +80,13 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi { super.readFromStream( data ); this.lastValue = data.readInt(); - this.output = this.lastValue > 0; + this.setOutput( this.lastValue > 0 ); return false; } private boolean doWork() { - if( this.output ) + if( this.isOutput() ) { return false; } @@ -94,9 +94,9 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi final TileEntity te = this.getTile(); final World w = te.getWorldObj(); - final int newLevel = w.getBlockLightValue( te.xCoord + this.side.offsetX, te.yCoord + this.side.offsetY, te.zCoord + this.side.offsetZ ); + final int newLevel = w.getBlockLightValue( te.xCoord + this.getSide().offsetX, te.yCoord + this.getSide().offsetY, te.zCoord + this.getSide().offsetZ ); - if( this.lastValue != newLevel && this.proxy.isActive() ) + if( this.lastValue != newLevel && this.getProxy().isActive() ) { this.lastValue = newLevel; try @@ -122,7 +122,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi this.doWork(); - if( this.output ) + if( this.isOutput() ) { this.getHost().markForUpdate(); } @@ -131,7 +131,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi @Override public int getLightLevel() { - if( this.output && this.isPowered() ) + if( this.isOutput() && this.isPowered() ) { return this.blockLight( this.lastValue ); } @@ -139,7 +139,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi return 0; } - public void setLightLevel( final int out ) + private void setLightLevel( final int out ) { this.lastValue = out; this.getHost().markForUpdate(); @@ -150,7 +150,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi if( this.opacity < 0 ) { final TileEntity te = this.getTile(); - this.opacity = 255 - te.getWorldObj().getBlockLightOpacity( te.xCoord + this.side.offsetX, te.yCoord + this.side.offsetY, te.zCoord + this.side.offsetZ ); + this.opacity = 255 - te.getWorldObj().getBlockLightOpacity( te.xCoord + this.getSide().offsetX, te.yCoord + this.getSide().offsetY, te.zCoord + this.getSide().offsetZ ); } return (int) ( emit * ( this.opacity / 255.0f ) ); @@ -191,10 +191,10 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi @Override public void onTunnelNetworkChange() { - if( this.output ) + if( this.isOutput() ) { final PartP2PLight src = this.getInput(); - if( src != null && src.proxy.isActive() ) + if( src != null && src.getProxy().isActive() ) { this.setLightLevel( src.lastValue ); } @@ -212,7 +212,7 @@ public class PartP2PLight extends PartP2PTunnel implements IGridTi @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.LightTunnel.min, TickRates.LightTunnel.max, false, false ); + return new TickingRequest( TickRates.LightTunnel.getMin(), TickRates.LightTunnel.getMax(), false, false ); } @Override diff --git a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java index 9bdb9feb..09b590c2 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PLiquids.java +++ b/src/main/java/appeng/parts/p2p/PartP2PLiquids.java @@ -43,10 +43,10 @@ import appeng.me.GridAccessException; public class PartP2PLiquids extends PartP2PTunnel implements IFluidHandler { - static final ThreadLocal> DEPTH = new ThreadLocal>(); + private static final ThreadLocal> DEPTH = new ThreadLocal>(); private static final FluidTankInfo[] ACTIVE_TANK = { new FluidTankInfo( null, 10000 ) }; private static final FluidTankInfo[] INACTIVE_TANK = { new FluidTankInfo( null, 0 ) }; - IFluidHandler cachedTank; + private IFluidHandler cachedTank; private int tmpUsed; public PartP2PLiquids( final ItemStack is ) @@ -76,7 +76,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl public void onNeighborChanged() { this.cachedTank = null; - if( this.output ) + if( this.isOutput() ) { final PartP2PLiquids in = this.getInput(); if( in != null ) @@ -111,7 +111,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl final IFluidHandler tank = l.getTarget(); if( tank != null ) { - l.tmpUsed = tank.fill( l.side.getOpposite(), resource.copy(), false ); + l.tmpUsed = tank.fill( l.getSide().getOpposite(), resource.copy(), false ); } else { @@ -166,7 +166,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl final IFluidHandler tank = l.getTarget(); if( tank != null ) { - l.tmpUsed = tank.fill( l.side.getOpposite(), insert.copy(), true ); + l.tmpUsed = tank.fill( l.getSide().getOpposite(), insert.copy(), true ); } else { @@ -197,7 +197,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return s; } - List getOutputs( final Fluid input ) + private List getOutputs( final Fluid input ) { final List outs = new LinkedList(); @@ -208,7 +208,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl final IFluidHandler handler = l.getTarget(); if( handler != null ) { - if( handler.canFill( l.side.getOpposite(), input ) ) + if( handler.canFill( l.getSide().getOpposite(), input ) ) { outs.add( l ); } @@ -223,9 +223,9 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return outs; } - IFluidHandler getTarget() + private IFluidHandler getTarget() { - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return null; } @@ -235,7 +235,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl return this.cachedTank; } - final TileEntity te = this.tile.getWorldObj().getTileEntity( this.tile.xCoord + this.side.offsetX, this.tile.yCoord + this.side.offsetY, this.tile.zCoord + this.side.offsetZ ); + final TileEntity te = this.getTile().getWorldObj().getTileEntity( this.getTile().xCoord + this.getSide().offsetX, this.getTile().yCoord + this.getSide().offsetY, this.getTile().zCoord + this.getSide().offsetZ ); if( te instanceof IFluidHandler ) { return this.cachedTank = (IFluidHandler) te; @@ -259,7 +259,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl @Override public boolean canFill( final ForgeDirection from, final Fluid fluid ) { - return !this.output && from == this.side && !this.getOutputs( fluid ).isEmpty(); + return !this.isOutput() && from == this.getSide() && !this.getOutputs( fluid ).isEmpty(); } @Override @@ -271,7 +271,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl @Override public FluidTankInfo[] getTankInfo( final ForgeDirection from ) { - if( from == this.side ) + if( from == this.getSide() ) { return this.getTank(); } @@ -280,7 +280,7 @@ public class PartP2PLiquids extends PartP2PTunnel implements IFl private FluidTankInfo[] getTank() { - if( this.output ) + if( this.isOutput() ) { final PartP2PLiquids tun = this.getInput(); if( tun != null ) diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index c64e4656..3f127246 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -107,7 +107,7 @@ public final class PartP2POpenComputers extends PartP2PTunnel diff --git a/src/main/java/appeng/parts/p2p/PartP2PPressure.java b/src/main/java/appeng/parts/p2p/PartP2PPressure.java index ef57383e..b4f8b70d 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PPressure.java +++ b/src/main/java/appeng/parts/p2p/PartP2PPressure.java @@ -75,7 +75,7 @@ public final class PartP2PPressure extends PartP2PTunnel implem @Override public IAirHandler getAirHandler( final ForgeDirection side ) { - if( side == this.side ) + if( side == this.getSide() ) { return this.getInternalHandler(); } @@ -102,7 +102,7 @@ public final class PartP2PPressure extends PartP2PTunnel implem { super.removeFromWorld(); - if( this.output && this.getInput() != null ) + if( this.isOutput() && this.getInput() != null ) { this.getInternalHandler().removeConnection( this.getInput().getInternalHandler() ); this.isConnected = false; @@ -112,13 +112,13 @@ public final class PartP2PPressure extends PartP2PTunnel implem @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.PressureTunnel.min, TickRates.PressureTunnel.max, false, false ); + return new TickingRequest( TickRates.PressureTunnel.getMin(), TickRates.PressureTunnel.getMax(), false, false ); } @Override public TickRateModulation tickingRequest( final IGridNode node, final int TicksSinceLastCall ) { - if( this.proxy.isPowered() && this.proxy.isActive() ) + if( this.getProxy().isPowered() && this.getProxy().isActive() ) { if( !this.isConnected ) { @@ -157,10 +157,10 @@ public final class PartP2PPressure extends PartP2PTunnel implem private void updateHandler() { - if( this.proxy.isPowered() && this.proxy.isActive() ) + if( this.getProxy().isPowered() && this.getProxy().isActive() ) { - if( this.output && this.getInput() != null ) + if( this.isOutput() && this.getInput() != null ) { this.getInternalHandler().createConnection( this.getInput().getInternalHandler() ); this.isConnected = true; diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index 06a9ffd6..b826354a 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -81,7 +81,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen @Override public int receiveEnergy( final ForgeDirection from, int maxReceive, final boolean simulate ) { - if( this.output ) + if( this.isOutput() ) { return 0; } @@ -108,7 +108,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { if( Platform.getRandomInt() % 2 > 0 ) { - final int receiver = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate ); + final int receiver = t.getOutput().receiveEnergy( t.getSide().getOpposite(), maxReceive, simulate ); maxReceive -= receiver; total += receiver; @@ -123,7 +123,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { for( final PartP2PRFPower t : this.getOutputs() ) { - final int receiver = t.getOutput().receiveEnergy( t.side.getOpposite(), maxReceive, simulate ); + final int receiver = t.getOutput().receiveEnergy( t.getSide().getOpposite(), maxReceive, simulate ); maxReceive -= receiver; total += receiver; @@ -165,17 +165,17 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen private IEnergyReceiver getOutput() { - if( this.output ) + if( this.isOutput() ) { if( !this.cachedTarget ) { final TileEntity self = this.getTile(); - final TileEntity te = self.getWorldObj().getTileEntity( self.xCoord + this.side.offsetX, self.yCoord + this.side.offsetY, self.zCoord + this.side.offsetZ ); + final TileEntity te = self.getWorldObj().getTileEntity( self.xCoord + this.getSide().offsetX, self.yCoord + this.getSide().offsetY, self.zCoord + this.getSide().offsetZ ); this.outputTarget = te instanceof IEnergyReceiver ? (IEnergyReceiver) te : null; this.cachedTarget = true; } - if( this.outputTarget == null || !this.outputTarget.canConnectEnergy( this.side.getOpposite() ) ) + if( this.outputTarget == null || !this.outputTarget.canConnectEnergy( this.getSide().getOpposite() ) ) { return NULL_HANDLER; } @@ -188,7 +188,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen @Override public int getEnergyStored( final ForgeDirection from ) { - if( this.output || !this.isActive() ) + if( this.isOutput() || !this.isActive() ) { return 0; } @@ -210,7 +210,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { for( final PartP2PRFPower t : this.getOutputs() ) { - total += t.getOutput().getEnergyStored( t.side.getOpposite() ); + total += t.getOutput().getEnergyStored( t.getSide().getOpposite() ); } } catch( final GridAccessException e ) @@ -229,7 +229,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen @Override public int getMaxEnergyStored( final ForgeDirection from ) { - if( this.output || !this.isActive() ) + if( this.isOutput() || !this.isActive() ) { return 0; } @@ -251,7 +251,7 @@ public final class PartP2PRFPower extends PartP2PTunnel implemen { for( final PartP2PRFPower t : this.getOutputs() ) { - total += t.getOutput().getMaxEnergyStored( t.side.getOpposite() ); + total += t.getOutput().getMaxEnergyStored( t.getSide().getOpposite() ); } } catch( final GridAccessException e ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java index b4af9f58..de187dc4 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRedstone.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRedstone.java @@ -41,8 +41,8 @@ import appeng.util.Platform; public class PartP2PRedstone extends PartP2PTunnel { - int power; - boolean recursive = false; + private int power; + private boolean recursive = false; public PartP2PRedstone( final ItemStack is ) { @@ -55,9 +55,9 @@ public class PartP2PRedstone extends PartP2PTunnel this.setNetworkReady(); } - public void setNetworkReady() + private void setNetworkReady() { - if( this.output ) + if( this.isOutput() ) { final PartP2PRedstone in = this.getInput(); if( in != null ) @@ -67,7 +67,7 @@ public class PartP2PRedstone extends PartP2PTunnel } } - protected void putInput( final Object o ) + private void putInput( final Object o ) { if( this.recursive ) { @@ -75,7 +75,7 @@ public class PartP2PRedstone extends PartP2PTunnel } this.recursive = true; - if( this.output && this.proxy.isActive() ) + if( this.isOutput() && this.getProxy().isActive() ) { final int newPower = (Integer) o; if( this.power != newPower ) @@ -87,13 +87,13 @@ public class PartP2PRedstone extends PartP2PTunnel this.recursive = false; } - public void notifyNeighbors() + private void notifyNeighbors() { - final World worldObj = this.tile.getWorldObj(); + final World worldObj = this.getTile().getWorldObj(); - final int xCoord = this.tile.xCoord; - final int yCoord = this.tile.yCoord; - final int zCoord = this.tile.zCoord; + final int xCoord = this.getTile().xCoord; + final int yCoord = this.getTile().yCoord; + final int zCoord = this.getTile().zCoord; Platform.notifyBlocksOfNeighbors( worldObj, xCoord, yCoord, zCoord ); @@ -153,22 +153,22 @@ public class PartP2PRedstone extends PartP2PTunnel @Override public void onNeighborChanged() { - if( !this.output ) + if( !this.isOutput() ) { - final int x = this.tile.xCoord + this.side.offsetX; - final int y = this.tile.yCoord + this.side.offsetY; - final int z = this.tile.zCoord + this.side.offsetZ; + final int x = this.getTile().xCoord + this.getSide().offsetX; + final int y = this.getTile().yCoord + this.getSide().offsetY; + final int z = this.getTile().zCoord + this.getSide().offsetZ; - final Block b = this.tile.getWorldObj().getBlock( x, y, z ); - if( b != null && !this.output ) + final Block b = this.getTile().getWorldObj().getBlock( x, y, z ); + if( b != null && !this.isOutput() ) { - int srcSide = this.side.ordinal(); + int srcSide = this.getSide().ordinal(); if( b instanceof BlockRedstoneWire ) { srcSide = 1; } - this.power = b.isProvidingStrongPower( this.tile.getWorldObj(), x, y, z, srcSide ); - this.power = Math.max( this.power, b.isProvidingWeakPower( this.tile.getWorldObj(), x, y, z, srcSide ) ); + this.power = b.isProvidingStrongPower( this.getTile().getWorldObj(), x, y, z, srcSide ); + this.power = Math.max( this.power, b.isProvidingWeakPower( this.getTile().getWorldObj(), x, y, z, srcSide ) ); this.sendToOutput( this.power ); } else @@ -187,13 +187,13 @@ public class PartP2PRedstone extends PartP2PTunnel @Override public int isProvidingStrongPower() { - return this.output ? this.power : 0; + return this.isOutput() ? this.power : 0; } @Override public int isProvidingWeakPower() { - return this.output ? this.power : 0; + return this.isOutput() ? this.power : 0; } private void sendToOutput( final int power ) diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index a681e920..9e8fac21 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -62,8 +62,8 @@ import appeng.util.Platform; public abstract class PartP2PTunnel extends PartBasicState { private final TunnelCollection type = new TunnelCollection( null, this.getClass() ); - public boolean output; - public long freq; + private boolean output; + private long freq; public PartP2PTunnel( final ItemStack is ) { @@ -81,16 +81,16 @@ public abstract class PartP2PTunnel extends PartBasicSt return null; } - public T getInput() + T getInput() { - if( this.freq == 0 ) + if( this.getFrequency() == 0 ) { return null; } try { - final PartP2PTunnel tunnel = this.proxy.getP2P().getInput( this.freq ); + final PartP2PTunnel tunnel = this.getProxy().getP2P().getInput( this.getFrequency() ); if( this.getClass().isInstance( tunnel ) ) { return (T) tunnel; @@ -103,11 +103,11 @@ public abstract class PartP2PTunnel extends PartBasicSt return null; } - public TunnelCollection getOutputs() throws GridAccessException + TunnelCollection getOutputs() throws GridAccessException { - if( this.proxy.isActive() ) + if( this.getProxy().isActive() ) { - return (TunnelCollection) this.proxy.getP2P().getOutputs( this.freq, this.getClass() ); + return (TunnelCollection) this.getProxy().getP2P().getOutputs( this.getFrequency(), this.getClass() ); } return new TunnelCollection( new ArrayList(), this.getClass() ); } @@ -129,7 +129,7 @@ public abstract class PartP2PTunnel extends PartBasicSt rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); - rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), this.is.getIconIndex(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); + rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); @@ -155,13 +155,13 @@ public abstract class PartP2PTunnel extends PartBasicSt @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); rh.setTexture( this.getTypeTexture() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), this.is.getIconIndex(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); + rh.setTexture( CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), this.getItemStack().getIconIndex(), CableBusTextures.PartTunnelSides.getIcon(), CableBusTextures.PartTunnelSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -201,16 +201,16 @@ public abstract class PartP2PTunnel extends PartBasicSt public void readFromNBT( final NBTTagCompound data ) { super.readFromNBT( data ); - this.output = data.getBoolean( "output" ); - this.freq = data.getLong( "freq" ); + this.setOutput( data.getBoolean( "output" ) ); + this.setFrequency( data.getLong( "freq" ) ); } @Override public void writeToNBT( final NBTTagCompound data ) { super.writeToNBT( data ); - data.setBoolean( "output", this.output ); - data.setLong( "freq", this.freq ); + data.setBoolean( "output", this.isOutput() ); + data.setLong( "freq", this.getFrequency() ); } @Override @@ -249,18 +249,18 @@ public abstract class PartP2PTunnel extends PartBasicSt final IPart testPart = ( (IPartItem) newType.getItem() ).createPartFromItemStack( newType ); if( testPart instanceof PartP2PTunnel ) { - this.getHost().removePart( this.side, true ); - final ForgeDirection dir = this.getHost().addPart( newType, this.side, player ); + this.getHost().removePart( this.getSide(), true ); + final ForgeDirection dir = this.getHost().addPart( newType, this.getSide(), player ); final IPart newBus = this.getHost().getPart( dir ); if( newBus instanceof PartP2PTunnel ) { final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; - newTunnel.output = true; + newTunnel.setOutput( true ); try { - final P2PCache p2p = newTunnel.proxy.getP2P(); + final P2PCache p2p = newTunnel.getProxy().getP2P(); p2p.updateFreq( newTunnel, freq ); } catch( final GridAccessException e ) @@ -353,24 +353,24 @@ public abstract class PartP2PTunnel extends PartBasicSt break; } - if( newType != null && !Platform.isSameItem( newType, this.is ) ) + if( newType != null && !Platform.isSameItem( newType, this.getItemStack() ) ) { - final boolean oldOutput = this.output; - final long myFreq = this.freq; + final boolean oldOutput = this.isOutput(); + final long myFreq = this.getFrequency(); - this.getHost().removePart( this.side, false ); - final ForgeDirection dir = this.getHost().addPart( newType, this.side, player ); + this.getHost().removePart( this.getSide(), false ); + final ForgeDirection dir = this.getHost().addPart( newType, this.getSide(), player ); final IPart newBus = this.getHost().getPart( dir ); if( newBus instanceof PartP2PTunnel ) { final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; - newTunnel.output = oldOutput; + newTunnel.setOutput( oldOutput ); newTunnel.onTunnelNetworkChange(); try { - final P2PCache p2p = newTunnel.proxy.getP2P(); + final P2PCache p2p = newTunnel.getProxy().getP2P(); p2p.updateFreq( newTunnel, myFreq ); } catch( final GridAccessException e ) @@ -379,7 +379,7 @@ public abstract class PartP2PTunnel extends PartBasicSt } } - Platform.notifyBlocksOfNeighbors( this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord ); + Platform.notifyBlocksOfNeighbors( this.getTile().getWorldObj(), this.getTile().xCoord, this.getTile().yCoord, this.getTile().zCoord ); return true; } } @@ -396,18 +396,18 @@ public abstract class PartP2PTunnel extends PartBasicSt final IMemoryCard mc = (IMemoryCard) is.getItem(); final NBTTagCompound data = new NBTTagCompound(); - long newFreq = this.freq; - final boolean wasOutput = this.output; - this.output = false; + long newFreq = this.getFrequency(); + final boolean wasOutput = this.isOutput(); + this.setOutput( false ); - if( wasOutput || this.freq == 0 ) + if( wasOutput || this.getFrequency() == 0 ) { newFreq = System.currentTimeMillis(); } try { - this.proxy.getP2P().updateFreq( this, newFreq ); + this.getProxy().getP2P().updateFreq( this, newFreq ); } catch( final GridAccessException e ) { @@ -420,7 +420,7 @@ public abstract class PartP2PTunnel extends PartBasicSt final String type = p2pItem.getUnlocalizedName(); p2pItem.writeToNBT( data ); - data.setLong( "freq", this.freq ); + data.setLong( "freq", this.getFrequency() ); mc.setMemoryCardContents( is, type + ".name", data ); mc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED ); @@ -451,11 +451,31 @@ public abstract class PartP2PTunnel extends PartBasicSt try { - this.proxy.getEnergy().extractAEPower( ae_to_tax, Actionable.MODULATE, PowerMultiplier.ONE ); + this.getProxy().getEnergy().extractAEPower( ae_to_tax, Actionable.MODULATE, PowerMultiplier.ONE ); } catch( final GridAccessException e ) { // :P } } + + public long getFrequency() + { + return this.freq; + } + + public void setFrequency( final long freq ) + { + this.freq = freq; + } + + public boolean isOutput() + { + return this.output; + } + + void setOutput( final boolean output ) + { + this.output = output; + } } diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index b1d9e3cb..3584e105 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -50,13 +50,13 @@ import appeng.me.helpers.AENetworkProxy; public class PartP2PTunnelME extends PartP2PTunnel implements IGridTickable { - public final Connections connection = new Connections( this ); - final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); + private final Connections connection = new Connections( this ); + private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); public PartP2PTunnelME( final ItemStack is ) { super( is ); - this.proxy.setFlags( GridFlags.REQUIRE_CHANNEL, GridFlags.COMPRESSED_CHANNEL ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL, GridFlags.COMPRESSED_CHANNEL ); this.outerProxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED ); } @@ -78,11 +78,11 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I public void onTunnelNetworkChange() { super.onTunnelNetworkChange(); - if( !this.output ) + if( !this.isOutput() ) { try { - this.proxy.getTick().wakeDevice( this.proxy.getNode() ); + this.getProxy().getTick().wakeDevice( this.getProxy().getNode() ); } catch( final GridAccessException e ) { @@ -134,7 +134,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.METunnel.min, TickRates.METunnel.max, true, false ); + return new TickingRequest( TickRates.METunnel.getMin(), TickRates.METunnel.getMax(), true, false ); } @Override @@ -143,24 +143,24 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I // just move on... try { - if( !this.proxy.getPath().isNetworkBooting() ) + if( !this.getProxy().getPath().isNetworkBooting() ) { - if( !this.proxy.getEnergy().isNetworkPowered() ) + if( !this.getProxy().getEnergy().isNetworkPowered() ) { this.connection.markDestroy(); - TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.getTile().getWorldObj(), this.connection ); } else { - if( this.proxy.isActive() ) + if( this.getProxy().isActive() ) { this.connection.markCreate(); - TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.getTile().getWorldObj(), this.connection ); } else { this.connection.markDestroy(); - TickHandler.INSTANCE.addCallable( this.tile.getWorldObj(), this.connection ); + TickHandler.INSTANCE.addCallable( this.getTile().getWorldObj(), this.connection ); } } @@ -177,32 +177,32 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I public void updateConnections( final Connections connections ) { - if( connections.destroy ) + if( connections.isDestroy() ) { - for( final TunnelConnection cw : this.connection.connections.values() ) + for( final TunnelConnection cw : this.connection.getConnections().values() ) { - cw.c.destroy(); + cw.getConnection().destroy(); } - this.connection.connections.clear(); + this.connection.getConnections().clear(); } - else if( connections.create ) + else if( connections.isCreate() ) { - final Iterator i = this.connection.connections.values().iterator(); + final Iterator i = this.connection.getConnections().values().iterator(); while( i.hasNext() ) { final TunnelConnection cw = i.next(); try { - if( cw.tunnel.proxy.getGrid() != this.proxy.getGrid() ) + if( cw.getTunnel().getProxy().getGrid() != this.getProxy().getGrid() ) { - cw.c.destroy(); + cw.getConnection().destroy(); i.remove(); } - else if( !cw.tunnel.proxy.isActive() ) + else if( !cw.getTunnel().getProxy().isActive() ) { - cw.c.destroy(); + cw.getConnection().destroy(); i.remove(); } } @@ -217,7 +217,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { for( final PartP2PTunnelME me : this.getOutputs() ) { - if( me.proxy.isActive() && connections.connections.get( me.getGridNode() ) == null ) + if( me.getProxy().isActive() && connections.getConnections().get( me.getGridNode() ) == null ) { newSides.add( me ); } @@ -227,7 +227,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { try { - connections.connections.put( me.getGridNode(), new TunnelConnection( me, AEApi.instance().createGridConnection( this.outerProxy.getNode(), me.outerProxy.getNode() ) ) ); + connections.getConnections().put( me.getGridNode(), new TunnelConnection( me, AEApi.instance().createGridConnection( this.outerProxy.getNode(), me.outerProxy.getNode() ) ) ); } catch( final FailedConnection e ) { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java index bd3aab05..2bb1a6c5 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartDisplay.java @@ -60,7 +60,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting final IIcon sideTexture = CableBusTextures.PartMonitorSides.getIcon(); final IIcon backTexture = CableBusTextures.PartMonitorBack.getIcon(); - rh.setTexture( sideTexture, sideTexture, backTexture, this.is.getIconIndex(), sideTexture, sideTexture ); + rh.setTexture( sideTexture, sideTexture, backTexture, this.getItemStack().getIconIndex(), sideTexture, sideTexture ); rh.renderInventoryBox( renderer ); rh.setInvColor( this.getColor().whiteVariant ); @@ -80,12 +80,12 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting @SideOnly( Side.CLIENT ) public void renderStatic( final int x, final int y, final int z, final IPartRenderHelper rh, final RenderBlocks renderer ) { - this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache ); + this.setRenderCache( rh.useSimplifiedRendering( x, y, z, this, this.getRenderCache() ) ); final IIcon sideTexture = CableBusTextures.PartMonitorSides.getIcon(); final IIcon backTexture = CableBusTextures.PartMonitorBack.getIcon(); - rh.setTexture( sideTexture, sideTexture, backTexture, this.is.getIconIndex(), sideTexture, sideTexture ); + rh.setTexture( sideTexture, sideTexture, backTexture, this.getItemStack().getIconIndex(), sideTexture, sideTexture ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); @@ -111,7 +111,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting final IIcon sideStatusTexture = CableBusTextures.PartMonitorSidesStatus.getIcon(); - rh.setTexture( sideStatusTexture, sideStatusTexture, backTexture, this.is.getIconIndex(), sideStatusTexture, sideStatusTexture ); + rh.setTexture( sideStatusTexture, sideStatusTexture, backTexture, this.getItemStack().getIconIndex(), sideStatusTexture, sideStatusTexture ); rh.setBounds( 4, 4, 13, 12, 12, 14 ); rh.renderBlock( x, y, z, renderer ); diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index 732b6348..02a34f2f 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -166,7 +166,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements return true; } - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return false; } @@ -176,7 +176,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements return false; } - final TileEntity te = this.tile; + final TileEntity te = this.getTile(); final ItemStack eq = player.getCurrentEquippedItem(); if( Platform.isWrench( player, eq, te.xCoord, te.yCoord, te.zCoord ) ) @@ -200,7 +200,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements } // update the system... - public void configureWatchers() + private void configureWatchers() { if( this.myWatcher != null ) { @@ -216,7 +216,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements this.myWatcher.add( this.configuredItem ); } - this.updateReportingValue( this.proxy.getStorage().getItemInventory() ); + this.updateReportingValue( this.getProxy().getStorage().getItemInventory() ); } } catch( final GridAccessException e ) @@ -313,7 +313,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements { // GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); - final ForgeDirection d = this.side; + final ForgeDirection d = this.getSide(); GL11.glTranslated( d.offsetX * 0.77, d.offsetY * 0.77, d.offsetZ * 0.77 ); @@ -366,7 +366,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements // RenderHelper.enableGUIStandardItemLighting(); tess.setColorOpaque_F( 1.0f, 1.0f, 1.0f ); - ClientHelper.proxy.doRenderItem( sis, this.tile.getWorldObj() ); + ClientHelper.proxy.doRenderItem( sis, this.getTile().getWorldObj() ); } catch( final Exception e ) { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java index 647d064a..74b443d6 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartPanel.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartPanel.java @@ -87,7 +87,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting final IIcon sideTexture = CableBusTextures.PartMonitorSides.getIcon(); final IIcon backTexture = CableBusTextures.PartMonitorBack.getIcon(); - rh.setTexture( sideTexture, sideTexture, backTexture, this.is.getIconIndex(), sideTexture, sideTexture ); + rh.setTexture( sideTexture, sideTexture, backTexture, this.getItemStack().getIconIndex(), sideTexture, sideTexture ); rh.renderInventoryBox( renderer ); rh.setInvColor( this.getBrightnessColor() ); @@ -104,7 +104,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting final IIcon sideTexture = CableBusTextures.PartMonitorSides.getIcon(); final IIcon backTexture = CableBusTextures.PartMonitorBack.getIcon(); - rh.setTexture( sideTexture, sideTexture, backTexture, this.is.getIconIndex(), sideTexture, sideTexture ); + rh.setTexture( sideTexture, sideTexture, backTexture, this.getItemStack().getIconIndex(), sideTexture, sideTexture ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java index 75c8e429..0d4407a6 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java @@ -80,12 +80,12 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM if( requireChannel ) { - this.proxy.setFlags( GridFlags.REQUIRE_CHANNEL ); - this.proxy.setIdlePowerUsage( 1.0 / 2.0 ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getProxy().setIdlePowerUsage( 1.0 / 2.0 ); } else { - this.proxy.setIdlePowerUsage( 1.0 / 16.0 ); // lights drain a little bit. + this.getProxy().setIdlePowerUsage( 1.0 / 16.0 ); // lights drain a little bit. } } @@ -145,17 +145,17 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM try { - if( this.proxy.getEnergy().isNetworkPowered() ) + if( this.getProxy().getEnergy().isNetworkPowered() ) { this.clientFlags = this.getClientFlags() | AbstractPartReporting.POWERED_FLAG; } - if( this.proxy.getPath().isNetworkBooting() ) + if( this.getProxy().getPath().isNetworkBooting() ) { this.clientFlags = this.getClientFlags() | AbstractPartReporting.BOOTING_FLAG; } - if( this.proxy.getNode().meetsChannelRequirements() ) + if( this.getProxy().getNode().meetsChannelRequirements() ) { this.clientFlags = this.getClientFlags() | AbstractPartReporting.CHANNEL_FLAG; } @@ -218,7 +218,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM break; } - this.host.markForUpdate(); + this.getHost().markForUpdate(); this.saveChanges(); } return true; @@ -250,7 +250,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM if( this.opacity < 0 ) { final TileEntity te = this.getTile(); - this.opacity = 255 - te.getWorldObj().getBlockLightOpacity( te.xCoord + this.side.offsetX, te.yCoord + this.side.offsetY, te.zCoord + this.side.offsetZ ); + this.opacity = 255 - te.getWorldObj().getBlockLightOpacity( te.xCoord + this.getSide().offsetX, te.yCoord + this.getSide().offsetY, te.zCoord + this.getSide().offsetZ ); } return (int) ( emit * ( this.opacity / 255.0f ) ); @@ -263,7 +263,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM { if( Platform.isServer() ) { - return this.proxy.getEnergy().isNetworkPowered(); + return this.getProxy().getEnergy().isNetworkPowered(); } else { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java b/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java index c8e379f9..d5cfbddc 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartTerminal.java @@ -121,7 +121,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, this.getGui( player ) ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), this.getGui( player ) ); return true; } @@ -139,7 +139,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement { try { - return this.proxy.getStorage().getItemInventory(); + return this.getProxy().getStorage().getItemInventory(); } catch( final GridAccessException e ) { @@ -153,7 +153,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement { try { - return this.proxy.getStorage().getFluidInventory(); + return this.getProxy().getStorage().getFluidInventory(); } catch( final GridAccessException e ) { @@ -177,6 +177,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement @Override public void onChangeInventory( final IInventory inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack ) { - this.host.markForSave(); + this.getHost().markForSave(); } } diff --git a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java index 78ca7d33..214ec79e 100644 --- a/src/main/java/appeng/parts/reporting/PartConversionMonitor.java +++ b/src/main/java/appeng/parts/reporting/PartConversionMonitor.java @@ -61,7 +61,7 @@ public class PartConversionMonitor extends AbstractPartMonitor return true; } - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return false; } @@ -84,13 +84,13 @@ public class PartConversionMonitor extends AbstractPartMonitor { try { - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return false; } - final IEnergySource energy = this.proxy.getEnergy(); - final IMEMonitor cell = this.proxy.getStorage().getItemInventory(); + final IEnergySource energy = this.getProxy().getEnergy(); + final IMEMonitor cell = this.getProxy().getStorage().getItemInventory(); final IAEItemStack input = AEItemStack.create( item ); if( ModeB ) @@ -129,13 +129,13 @@ public class PartConversionMonitor extends AbstractPartMonitor { try { - if( !this.proxy.isActive() ) + if( !this.getProxy().isActive() ) { return; } - final IEnergySource energy = this.proxy.getEnergy(); - final IMEMonitor cell = this.proxy.getStorage().getItemInventory(); + final IEnergySource energy = this.getProxy().getEnergy(); + final IMEMonitor cell = this.getProxy().getStorage().getItemInventory(); final ItemStack is = input.getItemStack(); input.setStackSize( is.getMaxStackSize() ); @@ -148,9 +148,9 @@ public class PartConversionMonitor extends AbstractPartMonitor newItems = adaptor.addItems( newItems ); if( newItems != null ) { - final TileEntity te = this.tile; + final TileEntity te = this.getTile(); final List list = Collections.singletonList( newItems ); - Platform.spawnDrops( player.worldObj, te.xCoord + this.side.offsetX, te.yCoord + this.side.offsetY, te.zCoord + this.side.offsetZ, list ); + Platform.spawnDrops( player.worldObj, te.xCoord + this.getSide().offsetX, te.yCoord + this.getSide().offsetY, te.zCoord + this.getSide().offsetZ, list ); } if( player.openContainer != null ) diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index 2a53039d..3c5b8c04 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -82,12 +82,12 @@ public class PartCraftingTerminal extends AbstractPartTerminal int z = (int) p.posZ; if( this.getHost().getTile() != null ) { - x = this.tile.xCoord; - y = this.tile.yCoord; - z = this.tile.zCoord; + x = this.getTile().xCoord; + y = this.getTile().yCoord; + z = this.getTile().zCoord; } - if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.side, p ) ) + if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) ) { return GuiBridge.GUI_CRAFTING_TERMINAL; } diff --git a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java index 7a8dc9e6..6b9c4f5e 100644 --- a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java @@ -51,7 +51,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay return true; } - Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_INTERFACE_TERMINAL ); + Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_INTERFACE_TERMINAL ); return true; } diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index d9f6da5a..93db93cf 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java @@ -97,12 +97,12 @@ public class PartPatternTerminal extends AbstractPartTerminal int z = (int) p.posZ; if( this.getHost().getTile() != null ) { - x = this.tile.xCoord; - y = this.tile.yCoord; - z = this.tile.zCoord; + x = this.getTile().xCoord; + y = this.getTile().yCoord; + z = this.getTile().zCoord; } - if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.side, p ) ) + if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) ) { return GuiBridge.GUI_PATTERN_TERMINAL; } @@ -143,7 +143,7 @@ public class PartPatternTerminal extends AbstractPartTerminal this.fixCraftingRecipes(); } - this.host.markForSave(); + this.getHost().markForSave(); } private void fixCraftingRecipes() diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 1d7508e7..54b5e032 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -124,9 +124,9 @@ public class AEItemResolver implements ISubItemResolver final String materialName = itemName.substring( itemName.indexOf( '.' ) + 1 ); final MaterialType mt = MaterialType.valueOf( materialName ); // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); - if( mt.itemInstance == ItemMultiMaterial.instance && mt.damageValue >= 0 && mt.isRegistered() ) + if( mt.getItemInstance() == ItemMultiMaterial.instance && mt.getDamageValue() >= 0 && mt.isRegistered() ) { - return new ResolverResult( "ItemMultiMaterial", mt.damageValue ); + return new ResolverResult( "ItemMultiMaterial", mt.getDamageValue() ); } } diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index f1b4f187..3c06399c 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -41,8 +41,7 @@ public class GroupIngredient implements IIngredient private final List ingredients; private final int qty; private ItemStack[] baked; - - boolean isInside = false; + private boolean isInside = false; public GroupIngredient( final String myName, final List ingredients, final int qty ) throws RecipeError { @@ -65,7 +64,7 @@ public class GroupIngredient implements IIngredient this.ingredients = ingredients; } - public IIngredient copy( final int qty ) throws RecipeError + IIngredient copy( final int qty ) throws RecipeError { Preconditions.checkState( qty > 0 ); return new GroupIngredient( this.name, this.ingredients, qty ); diff --git a/src/main/java/appeng/recipes/MissedIngredientSet.java b/src/main/java/appeng/recipes/MissedIngredientSet.java index 840f0a6a..41f398e2 100644 --- a/src/main/java/appeng/recipes/MissedIngredientSet.java +++ b/src/main/java/appeng/recipes/MissedIngredientSet.java @@ -33,7 +33,7 @@ public class MissedIngredientSet extends Throwable this.resolverResultSet = ro; } - public ResolverResultSet getResolverResultSet() + ResolverResultSet getResolverResultSet() { return this.resolverResultSet; } diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index 0e64c15a..f88cfe98 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -32,12 +32,12 @@ import appeng.api.recipes.ICraftHandler; public class RecipeData { - public final Map aliases = new HashMap(); - public final Map groups = new HashMap(); + final Map aliases = new HashMap(); + final Map groups = new HashMap(); - public final List handlers = new LinkedList(); - public final Set knownItem = new HashSet(); - public boolean crash = true; - public boolean exceptions = true; - public boolean errorOnMissing = true; + final List handlers = new LinkedList(); + final Set knownItem = new HashSet(); + boolean crash = true; + boolean exceptions = true; + boolean errorOnMissing = true; } diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index f8651267..98c9437c 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -120,7 +120,7 @@ public class RecipeHandler implements IRecipeHandler return i.getNameSpace() + ':' + i.getItemName(); } - public String getName( final ItemStack is ) throws RecipeError + private String getName( final ItemStack is ) throws RecipeError { Preconditions.checkNotNull( is ); @@ -228,7 +228,7 @@ public class RecipeHandler implements IRecipeHandler return realName; } - public String alias( final String in ) + String alias( final String in ) { Preconditions.checkNotNull( in ); @@ -514,7 +514,7 @@ public class RecipeHandler implements IRecipeHandler } } - public List findRecipe( final ItemStack output ) + private List findRecipe( final ItemStack output ) { final List out = new LinkedList(); diff --git a/src/main/java/appeng/recipes/handlers/Crusher.java b/src/main/java/appeng/recipes/handlers/Crusher.java index a6faf7ef..ee0a573e 100644 --- a/src/main/java/appeng/recipes/handlers/Crusher.java +++ b/src/main/java/appeng/recipes/handlers/Crusher.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class Crusher implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/Grind.java b/src/main/java/appeng/recipes/handlers/Grind.java index 6dc90866..2408d89f 100644 --- a/src/main/java/appeng/recipes/handlers/Grind.java +++ b/src/main/java/appeng/recipes/handlers/Grind.java @@ -36,8 +36,8 @@ import appeng.util.Platform; public class Grind implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/GrindFZ.java b/src/main/java/appeng/recipes/handlers/GrindFZ.java index aea92bac..eb0ef12e 100644 --- a/src/main/java/appeng/recipes/handlers/GrindFZ.java +++ b/src/main/java/appeng/recipes/handlers/GrindFZ.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class GrindFZ implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/HCCrusher.java b/src/main/java/appeng/recipes/handlers/HCCrusher.java index 526ed10e..3b32e713 100644 --- a/src/main/java/appeng/recipes/handlers/HCCrusher.java +++ b/src/main/java/appeng/recipes/handlers/HCCrusher.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class HCCrusher implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/Macerator.java b/src/main/java/appeng/recipes/handlers/Macerator.java index 77a16ee8..ca242073 100644 --- a/src/main/java/appeng/recipes/handlers/Macerator.java +++ b/src/main/java/appeng/recipes/handlers/Macerator.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class Macerator implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/MekCrusher.java b/src/main/java/appeng/recipes/handlers/MekCrusher.java index ec8acb8f..62af1e22 100644 --- a/src/main/java/appeng/recipes/handlers/MekCrusher.java +++ b/src/main/java/appeng/recipes/handlers/MekCrusher.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class MekCrusher implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/MekEnrichment.java b/src/main/java/appeng/recipes/handlers/MekEnrichment.java index 7ef93c23..2b4ca41c 100644 --- a/src/main/java/appeng/recipes/handlers/MekEnrichment.java +++ b/src/main/java/appeng/recipes/handlers/MekEnrichment.java @@ -39,8 +39,8 @@ import appeng.util.Platform; public class MekEnrichment implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/OreRegistration.java b/src/main/java/appeng/recipes/handlers/OreRegistration.java index dd8987d6..4a9f3ddf 100644 --- a/src/main/java/appeng/recipes/handlers/OreRegistration.java +++ b/src/main/java/appeng/recipes/handlers/OreRegistration.java @@ -34,8 +34,8 @@ import appeng.api.recipes.IIngredient; public class OreRegistration implements ICraftHandler { - final List inputs; - final String name; + private final List inputs; + private final String name; public OreRegistration( final List in, final String out ) { diff --git a/src/main/java/appeng/recipes/handlers/Pulverizer.java b/src/main/java/appeng/recipes/handlers/Pulverizer.java index a7ca50cc..97d15d80 100644 --- a/src/main/java/appeng/recipes/handlers/Pulverizer.java +++ b/src/main/java/appeng/recipes/handlers/Pulverizer.java @@ -38,8 +38,8 @@ import appeng.util.Platform; public class Pulverizer implements ICraftHandler, IWebsiteSerializer { - IIngredient pro_input; - IIngredient[] pro_output; + private IIngredient pro_input; + private IIngredient[] pro_output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index 20f7161b..a5384e45 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -40,8 +40,8 @@ import appeng.util.Platform; public class Shaped implements ICraftHandler, IWebsiteSerializer { - List> inputs; - IIngredient output; + private List> inputs; + private IIngredient output; private int rows; private int cols; diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index 460101ad..91c73def 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -40,8 +40,8 @@ import appeng.util.Platform; public class Shapeless implements ICraftHandler, IWebsiteSerializer { - List inputs; - IIngredient output; + private List inputs; + private IIngredient output; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/recipes/handlers/Smelt.java b/src/main/java/appeng/recipes/handlers/Smelt.java index 775fef7b..2d0c0608 100644 --- a/src/main/java/appeng/recipes/handlers/Smelt.java +++ b/src/main/java/appeng/recipes/handlers/Smelt.java @@ -37,8 +37,8 @@ import appeng.util.Platform; public class Smelt implements ICraftHandler, IWebsiteSerializer { - IIngredient in; - IIngredient out; + private IIngredient in; + private IIngredient out; @Override public void setup( final List> input, final List> output ) throws RecipeError diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/main/java/appeng/server/subcommands/ChunkLogger.java index 938711f8..73e44987 100644 --- a/src/main/java/appeng/server/subcommands/ChunkLogger.java +++ b/src/main/java/appeng/server/subcommands/ChunkLogger.java @@ -36,7 +36,7 @@ import appeng.server.ISubCommand; public class ChunkLogger implements ISubCommand { - boolean enabled = false; + private boolean enabled = false; @SubscribeEvent public void onChunkLoadEvent( final ChunkEvent.Load event ) diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 39a0a480..9609529b 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -91,12 +91,12 @@ public final class CompassService } } - public int jobSize() + private int jobSize() { return this.jobSize; } - public void cleanUp() + private void cleanUp() { for( final CompassReader cr : this.worldSet.values() ) { diff --git a/src/main/java/appeng/services/compass/CompassException.java b/src/main/java/appeng/services/compass/CompassException.java index 61385442..e61c09c2 100644 --- a/src/main/java/appeng/services/compass/CompassException.java +++ b/src/main/java/appeng/services/compass/CompassException.java @@ -24,7 +24,7 @@ public class CompassException extends RuntimeException private static final long serialVersionUID = 8825268683203860877L; - public final Throwable inner; + private final Throwable inner; public CompassException( final Throwable t ) { diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index ff47c0ef..c2278065 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -61,7 +61,7 @@ public final class CompassRegion this.openFile( false ); } - public void close() + void close() { try { @@ -79,7 +79,7 @@ public final class CompassRegion } } - public boolean hasBeacon( int cx, int cz ) + boolean hasBeacon( int cx, int cz ) { if( this.hasFile ) { @@ -96,7 +96,7 @@ public final class CompassRegion return false; } - public void setHasBeacon( int cx, int cz, final int cdy, final boolean hasBeacon ) + void setHasBeacon( int cx, int cz, final int cdy, final boolean hasBeacon ) { cx &= 0x3FF; cz &= 0x3FF; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index 8ce49308..99112d00 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -45,23 +45,23 @@ import appeng.util.Platform; public class CachedPlane { - final int x_size; - final int z_size; - final int cx_size; - final int cz_size; - final int x_offset; - final int y_offset; - final int z_offset; - final int y_size; - final Chunk[][] myChunks; - final Column[][] myColumns; - final LinkedList tiles = new LinkedList(); - final LinkedList ticks = new LinkedList(); - final World world; - final IMovableRegistry reg = AEApi.instance().registries().movable(); - final LinkedList updates = new LinkedList(); + private final int x_size; + private final int z_size; + private final int cx_size; + private final int cz_size; + private final int x_offset; + private final int y_offset; + private final int z_offset; + private final int y_size; + private final Chunk[][] myChunks; + private final Column[][] myColumns; + private final LinkedList tiles = new LinkedList(); + private final LinkedList ticks = new LinkedList(); + private final World world; + private final IMovableRegistry reg = AEApi.instance().registries().movable(); + private final LinkedList updates = new LinkedList(); private final IBlockDefinition matrixFrame = AEApi.instance().definitions().blocks().matrixFrame(); - int verticalBits; + private int verticalBits; public CachedPlane( final World w, final int minX, final int minY, final int minZ, final int maxX, final int maxY, final int maxZ ) { @@ -152,8 +152,8 @@ public class CachedPlane c.chunkTileEntityMap.remove( cp ); } - final long k = this.world.getTotalWorldTime(); - final List list = this.world.getPendingBlockUpdates( c, false ); + final long k = this.getWorld().getTotalWorldTime(); + final List list = this.getWorld().getPendingBlockUpdates( c, false ); if( list != null ) { for( final Object o : list ) @@ -174,7 +174,7 @@ public class CachedPlane { try { - this.world.loadedTileEntityList.remove( te ); + this.getWorld().loadedTileEntityList.remove( te ); } catch( final Exception e ) { @@ -264,16 +264,16 @@ public class CachedPlane private void markForUpdate( final int x, final int y, final int z ) { - this.updates.add( new WorldCoord( x, y, z ) ); + this.getUpdates().add( new WorldCoord( x, y, z ) ); for( final ForgeDirection d : ForgeDirection.VALID_DIRECTIONS ) { - this.updates.add( new WorldCoord( x + d.offsetX, y + d.offsetY, z + d.offsetZ ) ); + this.getUpdates().add( new WorldCoord( x + d.offsetX, y + d.offsetY, z + d.offsetZ ) ); } } private void addTick( final int x, final int y, final int z, final NextTickListEntry entry ) { - this.world.scheduleBlockUpdate( x + this.x_offset, y + this.y_offset, z + this.z_offset, entry.func_151351_a(), (int) entry.scheduledTime ); + this.getWorld().scheduleBlockUpdate( x + this.x_offset, y + this.y_offset, z + this.z_offset, entry.func_151351_a(), (int) entry.scheduledTime ); } private void addTile( final int x, final int y, final int z, final TileEntity te, final CachedPlane alternateDestination, final IMovableRegistry mr ) @@ -288,14 +288,14 @@ public class CachedPlane try { - handler.moveTile( te, this.world, x + this.x_offset, y + this.y_offset, z + this.z_offset ); + handler.moveTile( te, this.getWorld(), x + this.x_offset, y + this.y_offset, z + this.z_offset ); } catch( final Throwable e ) { AELog.error( e ); // attempt recovery... - te.setWorldObj( this.world ); + te.setWorldObj( this.getWorld() ); te.xCoord = x; te.yCoord = y; te.zCoord = z; @@ -305,8 +305,8 @@ public class CachedPlane if( c.c.isChunkLoaded ) { - this.world.addTileEntity( te ); - this.world.markBlockForUpdate( x, y, z ); + this.getWorld().addTileEntity( te ); + this.getWorld().markBlockForUpdate( x, y, z ); } } @@ -348,7 +348,7 @@ public class CachedPlane for( int y = 1; y < 255; y += 32 ) { - WorldData.instance().compassData().service().updateArea( this.world, c.xPosition << 4, y, c.zPosition << 4 ); + WorldData.instance().compassData().service().updateArea( this.getWorld(), c.xPosition << 4, y, c.zPosition << 4 ); } Platform.sendChunk( c, this.verticalBits ); @@ -356,7 +356,17 @@ public class CachedPlane } } - class Column + LinkedList getUpdates() + { + return this.updates; + } + + World getWorld() + { + return this.world; + } + + private class Column { private final int x; @@ -385,7 +395,7 @@ public class CachedPlane } } - public void setBlockIDWithMetadata( final int y, final Object[] blk ) + private void setBlockIDWithMetadata( final int y, final Object[] blk ) { for( final Block matrixFrameBlock : CachedPlane.this.matrixFrame.maybeBlock().asSet() ) { @@ -402,7 +412,7 @@ public class CachedPlane extendedBlockStorage.setExtBlocklightValue( this.x, y & 15, this.z, (Integer) blk[2] ); } - public Object[] getDetails( final int y ) + private Object[] getDetails( final int y ) { final ExtendedBlockStorage extendedblockstorage = this.storage[y >> 4]; this.ch[0] = extendedblockstorage.getBlockByExtId( this.x, y & 15, this.z ); @@ -411,7 +421,7 @@ public class CachedPlane return this.ch; } - public boolean doNotSkip( final int y ) + private boolean doNotSkip( final int y ) { final ExtendedBlockStorage extendedblockstorage = this.storage[y >> 4]; if( CachedPlane.this.reg.isBlacklisted( extendedblockstorage.getBlockByExtId( this.x, y & 15, this.z ) ) ) @@ -422,7 +432,7 @@ public class CachedPlane return this.skipThese == null || !this.skipThese.contains( y ); } - public void setSkip( final int yCoord ) + private void setSkip( final int yCoord ) { if( this.skipThese == null ) { diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 8950ac31..9a6f492f 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -35,7 +35,7 @@ import appeng.core.AEConfig; public class StorageChunkProvider extends ChunkProviderGenerate { - public static final int SQUARE_CHUNK_SIZE = 256; + private static final int SQUARE_CHUNK_SIZE = 256; private static final Block[] BLOCKS; static @@ -51,7 +51,7 @@ public class StorageChunkProvider extends ChunkProviderGenerate } } - final World world; + private final World world; public StorageChunkProvider( final World world, final long i ) { diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 9f2da47a..4b1ddeab 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -19,7 +19,6 @@ package appeng.spatial; -import java.lang.reflect.Method; import java.util.List; import net.minecraft.block.Block; @@ -43,7 +42,6 @@ public class StorageHelper { private static StorageHelper instance; - Method onEntityRemoved; public static StorageHelper getInstance() { @@ -62,7 +60,7 @@ public class StorageHelper * * @return teleported entity */ - public Entity teleportEntity( Entity entity, final TelDestination link ) + private Entity teleportEntity( Entity entity, final TelDestination link ) { final WorldServer oldWorld; final WorldServer newWorld; @@ -177,7 +175,7 @@ public class StorageHelper return entity; } - public void transverseEdges( final int minX, final int minY, final int minZ, final int maxX, final int maxY, final int maxZ, final ISpatialVisitor visitor ) + private void transverseEdges( final int minX, final int minY, final int minZ, final int maxX, final int maxY, final int maxZ, final ISpatialVisitor visitor ) { for( int y = minY; y < maxY; y++ ) { @@ -239,14 +237,14 @@ public class StorageHelper this.teleportEntity( e, new TelDestination( dst, dstBox, e.posX, e.posY, e.posZ, -x + i, -y + j, -z + k ) ); } - for( final WorldCoord wc : cDst.updates ) + for( final WorldCoord wc : cDst.getUpdates() ) { - cDst.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK ); + cDst.getWorld().notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK ); } - for( final WorldCoord wc : cSrc.updates ) + for( final WorldCoord wc : cSrc.getUpdates() ) { - cSrc.world.notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK ); + cSrc.getWorld().notifyBlockOfNeighborChange( wc.x, wc.y, wc.z, Platform.AIR_BLOCK ); } this.transverseEdges( x - 1, y - 1, z - 1, x + scaleX + 1, y + scaleY + 1, z + scaleZ + 1, new TriggerUpdates( src ) ); @@ -264,10 +262,10 @@ public class StorageHelper } - static class TriggerUpdates implements ISpatialVisitor + private static class TriggerUpdates implements ISpatialVisitor { - final World dst; + private final World dst; public TriggerUpdates( final World dst2 ) { @@ -282,12 +280,12 @@ public class StorageHelper } } - static class WrapInMatrixFrame implements ISpatialVisitor + private static class WrapInMatrixFrame implements ISpatialVisitor { - final World dst; - final Block blkID; - final int Meta; + private final World dst; + private final Block blkID; + private final int Meta; public WrapInMatrixFrame( final Block blockID, final int metaData, final World dst2 ) { @@ -303,16 +301,16 @@ public class StorageHelper } } - static class TelDestination + private static class TelDestination { - final World dim; - final double x; - final double y; - final double z; - final int xOff; - final int yOff; - final int zOff; + private final World dim; + private final double x; + private final double y; + private final double z; + private final int xOff; + private final int yOff; + private final int zOff; TelDestination( final World dimension, final AxisAlignedBB srcBox, final double x, final double y, final double z, final int tileX, final int tileY, final int tileZ ) { @@ -326,10 +324,10 @@ public class StorageHelper } } - static class METeleporter extends Teleporter + private static class METeleporter extends Teleporter { - final TelDestination destination; + private final TelDestination destination; public METeleporter( final WorldServer par1WorldServer, final TelDestination d ) { diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index ee69b81b..0f752481 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -64,12 +64,12 @@ import appeng.util.SettingsFrom; public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { - public static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); + private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); private static final Map, Map>> HANDLERS = new HashMap, Map>>(); private static final Map, IStackSrc> ITEM_STACKS = new HashMap, IStackSrc>(); private int renderFragment = 0; @Nullable - public String customName; + private String customName; private ForgeDirection forward = ForgeDirection.UNKNOWN; private ForgeDirection up = ForgeDirection.UNKNOWN; @@ -243,7 +243,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } } - public final boolean readFromStream( final ByteBuf data ) + private final boolean readFromStream( final ByteBuf data ) { boolean output = false; @@ -302,7 +302,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } } - public final void writeToStream( final ByteBuf data ) + private final void writeToStream( final ByteBuf data ) { try { diff --git a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java index beaf3e55..acc221b4 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java @@ -42,13 +42,13 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora { @SideOnly( Side.CLIENT ) - public Integer dspList; + private Integer dspList; @SideOnly( Side.CLIENT ) - public boolean updateList; + private boolean updateList; - IAEItemStack dspPlay; - AEColor paintedColor = AEColor.Transparent; + private IAEItemStack dspPlay; + private AEColor paintedColor = AEColor.Transparent; @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileCraftingMonitorTile( final ByteBuf data ) throws IOException @@ -67,7 +67,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora this.dspPlay = null; } - this.updateList = true; + this.setUpdateList( true ); return oldPaintedColor != this.paintedColor; // tesr! } @@ -161,4 +161,24 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora this.markForUpdate(); return true; } + + public Integer getDisplayList() + { + return this.dspList; + } + + public void setDisplayList( final Integer dspList ) + { + this.dspList = dspList; + } + + public boolean isUpdateList() + { + return this.updateList; + } + + public void setUpdateList( final boolean updateList ) + { + this.updateList = updateList; + } } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index 46279282..b8c4ecaa 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -27,7 +27,7 @@ import appeng.api.definitions.IBlocks; public class TileCraftingStorageTile extends TileCraftingTile { - public static final int KILO_SCALAR = 1024; + private static final int KILO_SCALAR = 1024; @Override protected ItemStack getItemFromTile( final Object obj ) diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index be046efc..60da4ebf 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -57,16 +57,16 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { private final CraftingCPUCalculator calc = new CraftingCPUCalculator( this ); - public ISimplifiedBundle lightCache; + private ISimplifiedBundle lightCache; - public NBTTagCompound previousState = null; - public boolean isCoreBlock = false; - CraftingCPUCluster cluster; + private NBTTagCompound previousState = null; + private boolean isCoreBlock = false; + private CraftingCPUCluster cluster; public TileCraftingTile() { - this.gridProxy.setFlags( GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL ); - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setFlags( GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } @Override @@ -119,7 +119,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP public void onReady() { super.onReady(); - this.gridProxy.setVisualRepresentation( this.getItemFromTile( this ) ); + this.getProxy().setVisualRepresentation( this.getItemFromTile( this ) ); this.updateMultiBlock(); } @@ -149,9 +149,9 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP final boolean formed = this.isFormed(); boolean power = false; - if( this.gridProxy.isReady() ) + if( this.getProxy().isReady() ) { - power = this.gridProxy.isActive(); + power = this.getProxy().isActive(); } final int current = this.worldObj.getBlockMetadata( this.xCoord, this.yCoord, this.zCoord ); @@ -166,11 +166,11 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( formed ) { - this.gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) ); + this.getProxy().setValidSides( EnumSet.allOf( ForgeDirection.class ) ); } else { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } } } @@ -187,8 +187,8 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TileCraftingTile( final NBTTagCompound data ) { - data.setBoolean( "core", this.isCoreBlock ); - if( this.isCoreBlock && this.cluster != null ) + data.setBoolean( "core", this.isCoreBlock() ); + if( this.isCoreBlock() && this.cluster != null ) { this.cluster.writeToNBT( data ); } @@ -197,8 +197,8 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_TileCraftingTile( final NBTTagCompound data ) { - this.isCoreBlock = data.getBoolean( "core" ); - if( this.isCoreBlock ) + this.setCoreBlock( data.getBoolean( "core" ) ); + if( this.isCoreBlock() ) { if( this.cluster != null ) { @@ -206,7 +206,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP } else { - this.previousState = (NBTTagCompound) data.copy(); + this.setPreviousState( (NBTTagCompound) data.copy() ); } } } @@ -333,7 +333,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { return ( this.worldObj.getBlockMetadata( this.xCoord, this.yCoord, this.zCoord ) & 4 ) == 4; } - return this.gridProxy.isActive(); + return this.getProxy().isActive(); } @Override @@ -341,8 +341,38 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP { if( Platform.isServer() ) { - return this.gridProxy.isActive(); + return this.getProxy().isActive(); } return this.isPowered() && this.isFormed(); } + + public boolean isCoreBlock() + { + return this.isCoreBlock; + } + + public void setCoreBlock( final boolean isCoreBlock ) + { + this.isCoreBlock = isCoreBlock; + } + + public ISimplifiedBundle getLightCache() + { + return this.lightCache; + } + + public void setLightCache( final ISimplifiedBundle lightCache ) + { + this.lightCache = lightCache; + } + + public NBTTagCompound getPreviousState() + { + return this.previousState; + } + + public void setPreviousState( final NBTTagCompound previousState ) + { + this.previousState = previousState; + } } diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 4534e9c9..45a46a45 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -85,7 +85,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 9 + 2 ); private final IConfigManager settings; private final UpgradeInventory upgrades; - public ISimplifiedBundle lightCache; + private ISimplifiedBundle lightCache; private boolean isPowered = false; private ForgeDirection pushDirection = ForgeDirection.UNKNOWN; private ItemStack myPattern = null; @@ -102,12 +102,12 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade this.settings = new ConfigManager( this ); this.settings.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE ); this.inv.setMaxStackSize( 1 ); - this.gridProxy.setIdlePowerUsage( 0.0 ); + this.getGridProxy().setIdlePowerUsage( 0.0 ); this.upgrades = new DefinitionUpgradeInventory( assembler, this, this.getUpgradeSlots() ); this.craftingInv = new InventoryCrafting( new ContainerNull(), 3, 3 ); } - protected int getUpgradeSlots() + private int getUpgradeSlots() { return 5; } @@ -152,11 +152,11 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { if( this.isAwake ) { - this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().wakeDevice( this.getGridProxy().getNode() ); } else { - this.gridProxy.getTick().sleepDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().sleepDevice( this.getGridProxy().getNode() ); } } catch( final GridAccessException e ) @@ -553,7 +553,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { try { - return (int) ( this.gridProxy.getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, PowerMultiplier.CONFIG ) / acceleratorTax ); + return (int) ( this.getGridProxy().getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, PowerMultiplier.CONFIG ) / acceleratorTax ); } catch( final GridAccessException e ) { @@ -629,7 +629,7 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade try { - newState = this.gridProxy.isActive() && this.gridProxy.getEnergy().extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.0001; + newState = this.getGridProxy().isActive() && this.getGridProxy().getEnergy().extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.0001; } catch( final GridAccessException ignored ) { @@ -654,4 +654,14 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { return this.isPowered; } + + public ISimplifiedBundle getLightCache() + { + return this.lightCache; + } + + public void setLightCache( final ISimplifiedBundle lightCache ) + { + this.lightCache = lightCache; + } } diff --git a/src/main/java/appeng/tile/grid/AENetworkInvTile.java b/src/main/java/appeng/tile/grid/AENetworkInvTile.java index 369c159d..a497d7af 100644 --- a/src/main/java/appeng/tile/grid/AENetworkInvTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkInvTile.java @@ -34,24 +34,24 @@ import appeng.tile.events.TileEventType; public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable { - protected final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true ); + private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true ); @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.readFromNBT( data ); + this.getGridProxy().readFromNBT( data ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.writeToNBT( data ); + this.getGridProxy().writeToNBT( data ); } @Override public AENetworkProxy getProxy() { - return this.gridProxy; + return this.getGridProxy(); } @Override @@ -63,40 +63,45 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH @Override public IGridNode getGridNode( final ForgeDirection dir ) { - return this.gridProxy.getNode(); + return this.getGridProxy().getNode(); } @Override public void onChunkUnload() { super.onChunkUnload(); - this.gridProxy.onChunkUnload(); + this.getGridProxy().onChunkUnload(); } @Override public void onReady() { super.onReady(); - this.gridProxy.onReady(); + this.getGridProxy().onReady(); } @Override public void invalidate() { super.invalidate(); - this.gridProxy.invalidate(); + this.getGridProxy().invalidate(); } @Override public void validate() { super.validate(); - this.gridProxy.validate(); + this.getGridProxy().validate(); } @Override public IGridNode getActionableNode() { - return this.gridProxy.getNode(); + return this.getGridProxy().getNode(); + } + + public AENetworkProxy getGridProxy() + { + return this.gridProxy; } } diff --git a/src/main/java/appeng/tile/grid/AENetworkPowerTile.java b/src/main/java/appeng/tile/grid/AENetworkPowerTile.java index dafe4bc7..ee69f9cd 100644 --- a/src/main/java/appeng/tile/grid/AENetworkPowerTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkPowerTile.java @@ -36,18 +36,18 @@ import appeng.tile.powersink.AEBasePoweredTile; public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable { - protected final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true ); + private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true ); @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.readFromNBT( data ); + this.getProxy().readFromNBT( data ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.writeToNBT( data ); + this.getProxy().writeToNBT( data ); } @Override @@ -71,7 +71,7 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA @Override public IGridNode getGridNode( final ForgeDirection dir ) { - return this.gridProxy.getNode(); + return this.getProxy().getNode(); } @Override @@ -84,33 +84,34 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA public void validate() { super.validate(); - this.gridProxy.validate(); + this.getProxy().validate(); } @Override public void invalidate() { super.invalidate(); - this.gridProxy.invalidate(); + this.getProxy().invalidate(); } @Override public void onChunkUnload() { super.onChunkUnload(); - this.gridProxy.onChunkUnload(); + this.getProxy().onChunkUnload(); } @Override public void onReady() { super.onReady(); - this.gridProxy.onReady(); + this.getProxy().onReady(); } @Override public IGridNode getActionableNode() { - return this.gridProxy.getNode(); + return this.getProxy().getNode(); } + } diff --git a/src/main/java/appeng/tile/grid/AENetworkTile.java b/src/main/java/appeng/tile/grid/AENetworkTile.java index 464270f5..4507822e 100644 --- a/src/main/java/appeng/tile/grid/AENetworkTile.java +++ b/src/main/java/appeng/tile/grid/AENetworkTile.java @@ -36,18 +36,18 @@ import appeng.tile.events.TileEventType; public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable { - protected final AENetworkProxy gridProxy = this.createProxy(); + private final AENetworkProxy gridProxy = this.createProxy(); @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.readFromNBT( data ); + this.getProxy().readFromNBT( data ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_AENetwork( final NBTTagCompound data ) { - this.gridProxy.writeToNBT( data ); + this.getProxy().writeToNBT( data ); } protected AENetworkProxy createProxy() @@ -58,7 +58,7 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy @Override public IGridNode getGridNode( final ForgeDirection dir ) { - return this.gridProxy.getNode(); + return this.getProxy().getNode(); } @Override @@ -71,28 +71,28 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy public void onChunkUnload() { super.onChunkUnload(); - this.gridProxy.onChunkUnload(); + this.getProxy().onChunkUnload(); } @Override public void onReady() { super.onReady(); - this.gridProxy.onReady(); + this.getProxy().onReady(); } @Override public void invalidate() { super.invalidate(); - this.gridProxy.invalidate(); + this.getProxy().invalidate(); } @Override public void validate() { super.validate(); - this.gridProxy.validate(); + this.getProxy().validate(); } @Override @@ -116,6 +116,6 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy @Override public IGridNode getActionableNode() { - return this.gridProxy.getNode(); + return this.getProxy().getNode(); } } diff --git a/src/main/java/appeng/tile/grindstone/TileCrank.java b/src/main/java/appeng/tile/grindstone/TileCrank.java index f66eb8a9..ff73f4c0 100644 --- a/src/main/java/appeng/tile/grindstone/TileCrank.java +++ b/src/main/java/appeng/tile/grindstone/TileCrank.java @@ -41,21 +41,21 @@ import appeng.util.Platform; public class TileCrank extends AEBaseTile implements ICustomCollision { - final int ticksPerRotation = 18; + private final int ticksPerRotation = 18; // sided values.. - public float visibleRotation = 0; - public int charge = 0; + private float visibleRotation = 0; + private int charge = 0; - public int hits = 0; - public int rotation = 0; + private int hits = 0; + private int rotation = 0; @TileEvent( TileEventType.TICK ) public void Tick_TileCrank() { if( this.rotation > 0 ) { - this.visibleRotation -= 360 / ( this.ticksPerRotation ); + this.setVisibleRotation( this.getVisibleRotation() - 360 / ( this.ticksPerRotation ) ); this.charge++; if( this.charge >= this.ticksPerRotation ) { @@ -71,7 +71,7 @@ public class TileCrank extends AEBaseTile implements ICustomCollision } } - public ICrankable getGrinder() + private ICrankable getGrinder() { if( Platform.isClient() ) { @@ -168,4 +168,14 @@ public class TileCrank extends AEBaseTile implements ICustomCollision out.add( AxisAlignedBB.getBoundingBox( xOff + 0.15, yOff + 0.15, zOff + 0.15,// ahh xOff + 0.85, yOff + 0.85, zOff + 0.85 ) ); } + + public float getVisibleRotation() + { + return this.visibleRotation; + } + + private void setVisibleRotation( final float visibleRotation ) + { + this.visibleRotation = visibleRotation; + } } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 5d232485..b6ff2879 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -41,10 +41,10 @@ import appeng.util.inv.WrapperInventoryRange; public class TileGrinder extends AEBaseInvTile implements ICrankable { - final int[] inputs = { 0, 1, 2 }; - final int[] sides = { 0, 1, 2, 3, 4, 5 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 7 ); - int points; + private final int[] inputs = { 0, 1, 2 }; + private final int[] sides = { 0, 1, 2, 3, 4, 5 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 7 ); + private int points; @Override public void setOrientation( final ForgeDirection inForward, final ForgeDirection inUp ) diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index c32b8e1a..d6da37f3 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -38,10 +38,10 @@ import appeng.util.iterators.InvIterator; public class AppEngInternalAEInventory implements IInventory, Iterable { - protected final IAEAppEngInventory te; - protected final IAEItemStack[] inv; - final int size; - int maxStack; + private final IAEAppEngInventory te; + private final IAEItemStack[] inv; + private final int size; + private int maxStack; public AppEngInternalAEInventory( final IAEAppEngInventory te, final int s ) { @@ -80,7 +80,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable { - protected final int size; - protected final ItemStack[] inv; - public boolean enableClientEvents = false; - protected IAEAppEngInventory te; - protected int maxStack; + private final int size; + private final ItemStack[] inv; + private boolean enableClientEvents = false; + private IAEAppEngInventory te; + private int maxStack; public AppEngInternalInventory( final IAEAppEngInventory inventory, final int size ) { - this.te = inventory; + this.setTileEntity( inventory ); this.size = size; this.maxStack = 64; this.inv = new ItemStack[size]; @@ -97,9 +97,9 @@ public class AppEngInternalInventory implements IInventory, Iterable ns = split.splitStack( qty ); } - if( this.te != null && this.eventsEnabled() ) + if( this.getTileEntity() != null && this.eventsEnabled() ) { - this.te.onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, null ); + this.getTileEntity().onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, null ); } this.markDirty(); @@ -111,7 +111,7 @@ public class AppEngInternalInventory implements IInventory, Iterable protected boolean eventsEnabled() { - return Platform.isServer() || this.enableClientEvents; + return Platform.isServer() || this.isEnableClientEvents(); } @Override @@ -126,7 +126,7 @@ public class AppEngInternalInventory implements IInventory, Iterable final ItemStack oldStack = this.inv[slot]; this.inv[slot] = newItemStack; - if( this.te != null && this.eventsEnabled() ) + if( this.getTileEntity() != null && this.eventsEnabled() ) { ItemStack removed = oldStack; ItemStack added = newItemStack; @@ -151,7 +151,7 @@ public class AppEngInternalInventory implements IInventory, Iterable } } - this.te.onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added ); + this.getTileEntity().onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added ); this.markDirty(); } @@ -178,9 +178,9 @@ public class AppEngInternalInventory implements IInventory, Iterable @Override public void markDirty() { - if( this.te != null && this.eventsEnabled() ) + if( this.getTileEntity() != null && this.eventsEnabled() ) { - this.te.onChangeInventory( this, -1, InvOperation.markDirty, null, null ); + this.getTileEntity().onChangeInventory( this, -1, InvOperation.markDirty, null, null ); } } @@ -214,9 +214,9 @@ public class AppEngInternalInventory implements IInventory, Iterable // for guis... public void markDirty( final int slotIndex ) { - if( this.te != null && this.eventsEnabled() ) + if( this.getTileEntity() != null && this.eventsEnabled() ) { - this.te.onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null ); + this.getTileEntity().onChangeInventory( this, slotIndex, InvOperation.markDirty, null, null ); } } @@ -227,7 +227,7 @@ public class AppEngInternalInventory implements IInventory, Iterable data.setTag( name, c ); } - public void writeToNBT( final NBTTagCompound target ) + private void writeToNBT( final NBTTagCompound target ) { for( int x = 0; x < this.size; x++ ) { @@ -282,4 +282,24 @@ public class AppEngInternalInventory implements IInventory, Iterable { return new InvIterator( this ); } + + private boolean isEnableClientEvents() + { + return this.enableClientEvents; + } + + public void setEnableClientEvents( final boolean enableClientEvents ) + { + this.enableClientEvents = enableClientEvents; + } + + private IAEAppEngInventory getTileEntity() + { + return this.te; + } + + public void setTileEntity( final IAEAppEngInventory te ) + { + this.te = te; + } } diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index a54dbe50..7900c1ce 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -46,18 +46,18 @@ import appeng.util.IConfigManagerHost; public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost { - final AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 ); - final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 63 ); - final ConfigManager manager = new ConfigManager( this ); + private final AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 ); + private final AppEngInternalAEInventory config = new AppEngInternalAEInventory( this, 63 ); + private final ConfigManager manager = new ConfigManager( this ); - IInventory cacheUpgrades = null; - IInventory cacheConfig = null; + private IInventory cacheUpgrades = null; + private IInventory cacheConfig = null; private boolean locked = false; public TileCellWorkbench() { this.manager.registerSetting( Settings.COPY_MODE, CopyMode.CLEAR_ON_REMOVE ); - this.cell.enableClientEvents = true; + this.cell.setEnableClientEvents( true ); } public IInventory getCellUpgradeInventory() diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index 9aa2eb28..de3dad9b 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -55,19 +55,19 @@ import appeng.util.item.AEItemStack; public class TileCharger extends AENetworkPowerTile implements ICrankable { - final int[] sides = { 0 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 1 ); - int tickTickTimer = 0; + private final int[] sides = { 0 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 1 ); + private int tickTickTimer = 0; - int lastUpdate = 0; - boolean requiresUpdate = false; + private int lastUpdate = 0; + private boolean requiresUpdate = false; public TileCharger() { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); - this.gridProxy.setFlags(); - this.internalMaxPower = 1500; - this.gridProxy.setIdlePowerUsage( 0 ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setFlags(); + this.setInternalMaxPower( 1500 ); + this.getProxy().setIdlePowerUsage( 0 ); } @Override @@ -123,11 +123,11 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable final ItemStack myItem = this.getStackInSlot( 0 ); // charge from the network! - if( this.internalCurrentPower < 1499 ) + if( this.getInternalCurrentPower() < 1499 ) { try { - this.injectExternalPower( PowerUnits.AE, this.gridProxy.getEnergy().extractAEPower( Math.min( 150.0, 1500.0 - this.internalCurrentPower ), Actionable.MODULATE, PowerMultiplier.ONE ) ); + this.injectExternalPower( PowerUnits.AE, this.getProxy().getEnergy().extractAEPower( Math.min( 150.0, 1500.0 - this.getInternalCurrentPower() ), Actionable.MODULATE, PowerMultiplier.ONE ) ); this.tickTickTimer = 20; // keep ticking... } catch( final GridAccessException e ) @@ -143,27 +143,27 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable final IMaterials materials = AEApi.instance().definitions().materials(); - if( this.internalCurrentPower > 149 && Platform.isChargeable( myItem ) ) + if( this.getInternalCurrentPower() > 149 && Platform.isChargeable( myItem ) ) { final IAEItemPowerStorage ps = (IAEItemPowerStorage) myItem.getItem(); if( ps.getAEMaxPower( myItem ) > ps.getAECurrentPower( myItem ) ) { - final double oldPower = this.internalCurrentPower; + final double oldPower = this.getInternalCurrentPower(); final double adjustment = ps.injectAEPower( myItem, this.extractAEPower( 150.0, Actionable.MODULATE, PowerMultiplier.CONFIG ) ); - this.internalCurrentPower += adjustment; - if( oldPower > this.internalCurrentPower ) + this.setInternalCurrentPower( this.getInternalCurrentPower() + adjustment ); + if( oldPower > this.getInternalCurrentPower() ) { this.requiresUpdate = true; } this.tickTickTimer = 20; // keep ticking... } } - else if( this.internalCurrentPower > 1499 && materials.certusQuartzCrystal().isSameAs( myItem ) ) + else if( this.getInternalCurrentPower() > 1499 && materials.certusQuartzCrystal().isSameAs( myItem ) ) { if( Platform.getRandomFloat() > 0.8f ) // simulate wait { - this.extractAEPower( this.internalMaxPower, Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500 + this.extractAEPower( this.getInternalMaxPower(), Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500 for( final ItemStack charged : materials.certusQuartzCrystalCharged().maybeStack( myItem.stackSize ).asSet() ) { @@ -177,7 +177,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable public void setOrientation( final ForgeDirection inForward, final ForgeDirection inUp ) { super.setOrientation( inForward, inUp ); - this.gridProxy.setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) ); + this.getProxy().setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) ); this.setPowerSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) ); } @@ -190,7 +190,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable @Override public boolean canTurn() { - return this.internalCurrentPower < this.internalMaxPower; + return this.getInternalCurrentPower() < this.getInternalMaxPower(); } @Override @@ -199,13 +199,13 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable this.injectExternalPower( PowerUnits.AE, 150 ); final ItemStack myItem = this.getStackInSlot( 0 ); - if( this.internalCurrentPower > 1499 ) + if( this.getInternalCurrentPower() > 1499 ) { final IMaterials materials = AEApi.instance().definitions().materials(); if( materials.certusQuartzCrystal().isSameAs( myItem ) ) { - this.extractAEPower( this.internalMaxPower, Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500 + this.extractAEPower( this.getInternalMaxPower(), Actionable.MODULATE, PowerMultiplier.CONFIG );// 1500 for( final ItemStack charged : materials.certusQuartzCrystalCharged().maybeStack( myItem.stackSize ).asSet() ) { diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index 1ddd59d0..fa532ff7 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -49,11 +49,11 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf { private static final FluidTankInfo[] EMPTY = { new FluidTankInfo( null, 10 ) }; - final int[] sides = { 0, 1 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 3 ); - final ConfigManager cm = new ConfigManager( this ); + private final int[] sides = { 0, 1 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 3 ); + private final ConfigManager cm = new ConfigManager( this ); - public double storedPower = 0; + private double storedPower = 0; public TileCondenser() { @@ -64,14 +64,14 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf public void writeToNBT_TileCondenser( final NBTTagCompound data ) { this.cm.writeToNBT( data ); - data.setDouble( "storedPower", this.storedPower ); + data.setDouble( "storedPower", this.getStoredPower() ); } @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_TileCondenser( final NBTTagCompound data ) { this.cm.readFromNBT( data ); - this.storedPower = data.getDouble( "storedPower" ); + this.setStoredPower( data.getDouble( "storedPower" ) ); } public double getStorage() @@ -93,16 +93,16 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf public void addPower( final double rawPower ) { - this.storedPower += rawPower; - this.storedPower = Math.max( 0.0, Math.min( this.getStorage(), this.storedPower ) ); + this.setStoredPower( this.getStoredPower() + rawPower ); + this.setStoredPower( Math.max( 0.0, Math.min( this.getStorage(), this.getStoredPower() ) ) ); final double requiredPower = this.getRequiredPower(); final ItemStack output = this.getOutput(); - while( requiredPower <= this.storedPower && output != null && requiredPower > 0 ) + while( requiredPower <= this.getStoredPower() && output != null && requiredPower > 0 ) { if( this.canAddOutput( output ) ) { - this.storedPower -= requiredPower; + this.setStoredPower( this.getStoredPower() - requiredPower ); this.addOutput( output ); } else @@ -278,4 +278,14 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf { return this.cm; } + + public double getStoredPower() + { + return this.storedPower; + } + + private void setStoredPower( final double storedPower ) + { + this.storedPower = storedPower; + } } diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index 7ba90268..fdeb79b4 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -80,32 +80,32 @@ import appeng.util.item.AEItemStack; public class TileInscriber extends AENetworkPowerTile implements IGridTickable, IUpgradeableHost, IConfigManagerHost { - public final int maxProcessingTime = 100; - final int[] top = { 0 }; - final int[] bottom = { 1 }; - final int[] sides = { 2, 3 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 4 ); + private final int maxProcessingTime = 100; + private final int[] top = { 0 }; + private final int[] bottom = { 1 }; + private final int[] sides = { 2, 3 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 4 ); private final IConfigManager settings; private final UpgradeInventory upgrades; - public int processingTime = 0; + private int processingTime = 0; // cycles from 0 - 16, at 8 it preforms the action, at 16 it re-enables the normal routine. - public boolean smash; - public int finalStep; - public long clientStart; + private boolean smash; + private int finalStep; + private long clientStart; @Reflected public TileInscriber() { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); - this.internalMaxPower = 1500; - this.gridProxy.setIdlePowerUsage( 0 ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.setInternalMaxPower( 1500 ); + this.getProxy().setIdlePowerUsage( 0 ); this.settings = new ConfigManager( this ); final ITileDefinition inscriberDefinition = AEApi.instance().definitions().blocks().inscriber(); this.upgrades = new DefinitionUpgradeInventory( inscriberDefinition, this, this.getUpgradeSlots() ); } - protected int getUpgradeSlots() + private int getUpgradeSlots() { return 3; } @@ -137,13 +137,13 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { final int slot = data.readByte(); - final boolean oldSmash = this.smash; + final boolean oldSmash = this.isSmash(); final boolean newSmash = ( slot & 64 ) == 64; if( oldSmash != newSmash && newSmash ) { - this.smash = true; - this.clientStart = System.currentTimeMillis(); + this.setSmash( true ); + this.setClientStart( System.currentTimeMillis() ); } for( int num = 0; num < this.inv.getSizeInventory(); num++ ) @@ -164,7 +164,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileInscriber( final ByteBuf data ) throws IOException { - int slot = this.smash ? 64 : 0; + int slot = this.isSmash() ? 64 : 0; for( int num = 0; num < this.inv.getSizeInventory(); num++ ) { @@ -189,7 +189,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, public void setOrientation( final ForgeDirection inForward, final ForgeDirection inUp ) { super.setOrientation( inForward, inUp ); - this.gridProxy.setValidSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) ); + this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) ); this.setPowerSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) ); } @@ -229,7 +229,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { - if( this.smash ) + if( this.isSmash() ) { return false; } @@ -262,15 +262,15 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { if( slot != 3 ) { - this.processingTime = 0; + this.setProcessingTime( 0 ); } - if( !this.smash ) + if( !this.isSmash() ) { this.markForUpdate(); } - this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() ); + this.getProxy().getTick().wakeDevice( this.getProxy().getNode() ); } } catch( final GridAccessException e ) @@ -282,7 +282,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Override public boolean canExtractItem( final int slotIndex, final ItemStack extractedItem, final int side ) { - if( this.smash ) + if( this.isSmash() ) { return false; } @@ -309,7 +309,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.Inscriber.min, TickRates.Inscriber.max, !this.hasWork(), false ); + return new TickingRequest( TickRates.Inscriber.getMin(), TickRates.Inscriber.getMax(), !this.hasWork(), false ); } private boolean hasWork() @@ -319,8 +319,8 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, return true; } - this.processingTime = 0; - return this.smash; + this.setProcessingTime( 0 ); + return this.isSmash(); } @Nullable @@ -420,7 +420,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, @Override public TickRateModulation tickingRequest( final IGridNode node, final int ticksSinceLastCall ) { - if( this.smash ) + if( this.isSmash() ) { this.finalStep++; if( this.finalStep == 8 ) @@ -433,7 +433,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, if( ad.addItems( outputCopy ) == null ) { - this.processingTime = 0; + this.setProcessingTime( 0 ); if( out.getProcessType() == InscriberProcessType.Press ) { this.setInventorySlotContents( 0, null ); @@ -448,7 +448,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, else if( this.finalStep == 16 ) { this.finalStep = 0; - this.smash = false; + this.setSmash( false ); this.markForUpdate(); } } @@ -456,7 +456,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { try { - final IEnergyGrid eg = this.gridProxy.getEnergy(); + final IEnergyGrid eg = this.getProxy().getEnergy(); IEnergySource src = this; // Base 1, increase by 1 for each card @@ -475,13 +475,13 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { src.extractAEPower( powerConsumption, Actionable.MODULATE, PowerMultiplier.CONFIG ); - if( this.processingTime == 0 ) + if( this.getProcessingTime() == 0 ) { - this.processingTime += speedFactor; + this.setProcessingTime( this.getProcessingTime() + speedFactor ); } else { - this.processingTime += ticksSinceLastCall * speedFactor; + this.setProcessingTime( this.getProcessingTime() + ticksSinceLastCall * speedFactor ); } } } @@ -490,9 +490,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, // :P } - if( this.processingTime > this.maxProcessingTime ) + if( this.getProcessingTime() > this.getMaxProcessingTime() ) { - this.processingTime = this.maxProcessingTime; + this.setProcessingTime( this.getMaxProcessingTime() ); final IInscriberRecipe out = this.getTask(); if( out != null ) { @@ -500,7 +500,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( new WrapperInventoryRange( this.inv, 3, 1, true ), ForgeDirection.UNKNOWN ); if( ad.simulateAdd( outputCopy ) == null ) { - this.smash = true; + this.setSmash( true ); this.finalStep = 0; this.markForUpdate(); } @@ -543,4 +543,39 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue ) { } + + public long getClientStart() + { + return this.clientStart; + } + + private void setClientStart( final long clientStart ) + { + this.clientStart = clientStart; + } + + public boolean isSmash() + { + return this.smash; + } + + public void setSmash( final boolean smash ) + { + this.smash = smash; + } + + public int getMaxProcessingTime() + { + return this.maxProcessingTime; + } + + public int getProcessingTime() + { + return this.processingTime; + } + + private void setProcessingTime( final int processingTime ) + { + this.processingTime = processingTime; + } } diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index e13e4018..18f73e29 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -67,8 +67,8 @@ import appeng.util.inv.IInventoryDestination; public class TileInterface extends AENetworkInvTile implements IGridTickable, ITileStorageMonitorable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, IPriorityHost { - final DualityInterface duality = new DualityInterface( this.gridProxy, this ); - ForgeDirection pointAt = ForgeDirection.UNKNOWN; + private final DualityInterface duality = new DualityInterface( this.getGridProxy(), this ); + private ForgeDirection pointAt = ForgeDirection.UNKNOWN; @MENetworkEventSubscribe public void stateChange( final MENetworkChannelsChanged c ) @@ -115,7 +115,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT this.setOrientation( this.pointAt.offsetY != 0 ? ForgeDirection.SOUTH : ForgeDirection.UP, this.pointAt.getOpposite() ); } - this.gridProxy.setValidSides( EnumSet.complementOf( EnumSet.of( this.pointAt ) ) ); + this.getGridProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.pointAt ) ) ); this.markForUpdate(); this.markDirty(); } @@ -141,7 +141,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IT @Override public void onReady() { - this.gridProxy.setValidSides( EnumSet.complementOf( EnumSet.of( this.pointAt ) ) ); + this.getGridProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.pointAt ) ) ); super.onReady(); this.duality.initialize(); } diff --git a/src/main/java/appeng/tile/misc/TileLightDetector.java b/src/main/java/appeng/tile/misc/TileLightDetector.java index 9af65a69..1f6764ff 100644 --- a/src/main/java/appeng/tile/misc/TileLightDetector.java +++ b/src/main/java/appeng/tile/misc/TileLightDetector.java @@ -28,8 +28,8 @@ import appeng.util.Platform; public class TileLightDetector extends AEBaseTile { - int lastCheck = 30; - int lastLight = 0; + private int lastCheck = 30; + private int lastLight = 0; public boolean isReady() { diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index b573c7c4..be6855cf 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -48,10 +48,10 @@ import appeng.tile.events.TileEventType; public class TilePaint extends AEBaseTile { - static final int LIGHT_PER_DOT = 12; + private static final int LIGHT_PER_DOT = 12; - int isLit = 0; - List dots = null; + private int isLit = 0; + private List dots = null; @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TilePaint( final NBTTagCompound data ) @@ -64,7 +64,7 @@ public class TilePaint extends AEBaseTile } } - void writeBuffer( final ByteBuf out ) + private void writeBuffer( final ByteBuf out ) { if( this.dots == null ) { @@ -89,7 +89,7 @@ public class TilePaint extends AEBaseTile } } - void readBuffer( final ByteBuf in ) + private void readBuffer( final ByteBuf in ) { final byte howMany = in.readByte(); @@ -109,7 +109,7 @@ public class TilePaint extends AEBaseTile this.isLit = 0; for( final Splotch s : this.dots ) { - if( s.lumen ) + if( s.isLumen() ) { this.isLit += LIGHT_PER_DOT; } @@ -174,7 +174,7 @@ public class TilePaint extends AEBaseTile while( i.hasNext() ) { final Splotch s = i.next(); - if( s.side == side ) + if( s.getSide() == side ) { i.remove(); } @@ -189,7 +189,7 @@ public class TilePaint extends AEBaseTile this.isLit = 0; for( final Splotch s : this.dots ) { - if( s.lumen ) + if( s.isLumen() ) { this.isLit += LIGHT_PER_DOT; } diff --git a/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java b/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java index 26578840..d29a4c24 100644 --- a/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java @@ -40,13 +40,13 @@ import appeng.util.Platform; public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPowerChannelState, ICrystalGrowthAccelerator { - public boolean hasPower = false; + private boolean hasPower = false; public TileQuartzGrowthAccelerator() { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); - this.gridProxy.setFlags(); - this.gridProxy.setIdlePowerUsage( 8 ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setFlags(); + this.getProxy().setIdlePowerUsage( 8 ); } @MENetworkEventSubscribe @@ -64,9 +64,9 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileQuartzGrowthAccelerator( final ByteBuf data ) { - final boolean hadPower = this.hasPower; - this.hasPower = data.readBoolean(); - return this.hasPower != hadPower; + final boolean hadPower = this.isPowered(); + this.setPowered( data.readBoolean() ); + return this.isPowered() != hadPower; } @TileEvent( TileEventType.NETWORK_WRITE ) @@ -74,7 +74,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower { try { - data.writeBoolean( this.gridProxy.getEnergy().isNetworkPowered() ); + data.writeBoolean( this.getProxy().getEnergy().isNetworkPowered() ); } catch( final GridAccessException e ) { @@ -86,7 +86,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower public void setOrientation( final ForgeDirection inForward, final ForgeDirection inUp ) { super.setOrientation( inForward, inUp ); - this.gridProxy.setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) ); + this.getProxy().setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) ); } @Override @@ -96,7 +96,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower { try { - return this.gridProxy.getEnergy().isNetworkPowered(); + return this.getProxy().getEnergy().isNetworkPowered(); } catch( final GridAccessException e ) { @@ -112,4 +112,9 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower { return this.isPowered(); } + + private void setPowered( final boolean hasPower ) + { + this.hasPower = hasPower; + } } diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index e6d7b046..1ace95e6 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -82,18 +82,18 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp { private static int difference = 0; - public final AppEngInternalInventory configSlot = new AppEngInternalInventory( this, 1 ); + private final AppEngInternalInventory configSlot = new AppEngInternalInventory( this, 1 ); private final IConfigManager cm = new ConfigManager( this ); private final SecurityInventory inventory = new SecurityInventory( this ); private final MEMonitorHandler securityMonitor = new MEMonitorHandler( this.inventory ); - public long securityKey; - AEColor paintedColor = AEColor.Transparent; + private long securityKey; + private AEColor paintedColor = AEColor.Transparent; private boolean isActive = false; public TileSecurity() { - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); - this.gridProxy.setIdlePowerUsage( 2.0 ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getProxy().setIdlePowerUsage( 2.0 ); difference++; this.securityKey = System.currentTimeMillis() * 10 + difference; @@ -116,12 +116,12 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp @Override public void getDrops( final World w, final int x, final int y, final int z, final List drops ) { - if( !this.configSlot.isEmpty() ) + if( !this.getConfigSlot().isEmpty() ) { - drops.add( this.configSlot.getStackInSlot( 0 ) ); + drops.add( this.getConfigSlot().getStackInSlot( 0 ) ); } - for( final IAEItemStack ais : this.inventory.storedItems ) + for( final IAEItemStack ais : this.inventory.getStoredItems() ) { drops.add( ais.getItemStack() ); } @@ -147,7 +147,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileSecurity( final ByteBuf data ) { - data.writeBoolean( this.gridProxy.isActive() ); + data.writeBoolean( this.getProxy().isActive() ); data.writeByte( this.paintedColor.ordinal() ); } @@ -158,12 +158,12 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp data.setByte( "paintedColor", (byte) this.paintedColor.ordinal() ); data.setLong( "securityKey", this.securityKey ); - this.configSlot.writeToNBT( data, "config" ); + this.getConfigSlot().writeToNBT( data, "config" ); final NBTTagCompound storedItems = new NBTTagCompound(); int offset = 0; - for( final IAEItemStack ais : this.inventory.storedItems ) + for( final IAEItemStack ais : this.inventory.getStoredItems() ) { final NBTTagCompound it = new NBTTagCompound(); ais.getItemStack().writeToNBT( it ); @@ -184,7 +184,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp } this.securityKey = data.getLong( "securityKey" ); - this.configSlot.readFromNBT( data, "config" ); + this.getConfigSlot().readFromNBT( data, "config" ); final NBTTagCompound storedItems = data.getCompoundTag( "storedItems" ); for( final Object key : storedItems.func_150296_c() ) @@ -192,7 +192,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp final NBTBase obj = storedItems.getTag( (String) key ); if( obj instanceof NBTTagCompound ) { - this.inventory.storedItems.add( AEItemStack.create( ItemStack.loadItemStackFromNBT( (NBTTagCompound) obj ) ) ); + this.inventory.getStoredItems().add( AEItemStack.create( ItemStack.loadItemStackFromNBT( (NBTTagCompound) obj ) ) ); } } } @@ -202,7 +202,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp try { this.saveChanges(); - this.gridProxy.getGrid().postEvent( new MENetworkSecurityChange() ); + this.getProxy().getGrid().postEvent( new MENetworkSecurityChange() ); } catch( final GridAccessException e ) { @@ -286,7 +286,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp public boolean isPowered() { - return this.gridProxy.isActive(); + return this.getProxy().isActive(); } @Override @@ -313,7 +313,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp final IPlayerRegistry pr = AEApi.instance().registries().players(); // read permissions - for( final IAEItemStack ais : this.inventory.storedItems ) + for( final IAEItemStack ais : this.inventory.getStoredItems() ) { final ItemStack is = ais.getItemStack(); final Item i = is.getItem(); @@ -325,19 +325,19 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp } // make sure thea admin is Boss. - playerPerms.put( this.gridProxy.getNode().getPlayerID(), EnumSet.allOf( SecurityPermissions.class ) ); + playerPerms.put( this.getProxy().getNode().getPlayerID(), EnumSet.allOf( SecurityPermissions.class ) ); } @Override public boolean isSecurityEnabled() { - return this.isActive && this.gridProxy.isActive(); + return this.isActive && this.getProxy().isActive(); } @Override public int getOwner() { - return this.gridProxy.getNode().getPlayerID(); + return this.getProxy().getNode().getPlayerID(); } @Override @@ -359,4 +359,9 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp this.markForUpdate(); return true; } + + public AppEngInternalInventory getConfigSlot() + { + return this.configSlot; + } } diff --git a/src/main/java/appeng/tile/misc/TileVibrationChamber.java b/src/main/java/appeng/tile/misc/TileVibrationChamber.java index 06e48a1c..040ffac0 100644 --- a/src/main/java/appeng/tile/misc/TileVibrationChamber.java +++ b/src/main/java/appeng/tile/misc/TileVibrationChamber.java @@ -57,17 +57,17 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka private static final int MIN_BURN_SPEED = 20; private final IInventory inv = new AppEngInternalInventory( this, 1 ); - public int burnSpeed = 100; - public double burnTime = 0; - public double maxBurnTime = 0; + private int burnSpeed = 100; + private double burnTime = 0; + private double maxBurnTime = 0; // client side.. public boolean isOn; public TileVibrationChamber() { - this.gridProxy.setIdlePowerUsage( 0 ); - this.gridProxy.setFlags(); + this.getGridProxy().setIdlePowerUsage( 0 ); + this.getGridProxy().setFlags(); } @Override @@ -91,23 +91,23 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToNetwork( final ByteBuf data ) { - data.writeBoolean( this.burnTime > 0 ); + data.writeBoolean( this.getBurnTime() > 0 ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TileVibrationChamber( final NBTTagCompound data ) { - data.setDouble( "burnTime", this.burnTime ); - data.setDouble( "maxBurnTime", this.maxBurnTime ); - data.setInteger( "burnSpeed", this.burnSpeed ); + data.setDouble( "burnTime", this.getBurnTime() ); + data.setDouble( "maxBurnTime", this.getMaxBurnTime() ); + data.setInteger( "burnSpeed", this.getBurnSpeed() ); } @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_TileVibrationChamber( final NBTTagCompound data ) { - this.burnTime = data.getDouble( "burnTime" ); - this.maxBurnTime = data.getDouble( "maxBurnTime" ); - this.burnSpeed = data.getInteger( "burnSpeed" ); + this.setBurnTime( data.getDouble( "burnTime" ) ); + this.setMaxBurnTime( data.getDouble( "maxBurnTime" ) ); + this.setBurnSpeed( data.getInteger( "burnSpeed" ) ); } @Override @@ -125,13 +125,13 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka @Override public void onChangeInventory( final IInventory inv, final int slot, final InvOperation mc, final ItemStack removed, final ItemStack added ) { - if( this.burnTime <= 0 ) + if( this.getBurnTime() <= 0 ) { if( this.canEatFuel() ) { try { - this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().wakeDevice( this.getGridProxy().getNode() ); } catch( final GridAccessException e ) { @@ -176,44 +176,44 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka @Override public TickingRequest getTickingRequest( final IGridNode node ) { - if( this.burnTime <= 0 ) + if( this.getBurnTime() <= 0 ) { this.eatFuel(); } - return new TickingRequest( TickRates.VibrationChamber.min, TickRates.VibrationChamber.max, this.burnTime <= 0, false ); + return new TickingRequest( TickRates.VibrationChamber.getMin(), TickRates.VibrationChamber.getMax(), this.getBurnTime() <= 0, false ); } @Override public TickRateModulation tickingRequest( final IGridNode node, final int ticksSinceLastCall ) { - if( this.burnTime <= 0 ) + if( this.getBurnTime() <= 0 ) { this.eatFuel(); - if( this.burnTime > 0 ) + if( this.getBurnTime() > 0 ) { return TickRateModulation.URGENT; } - this.burnSpeed = 100; + this.setBurnSpeed( 100 ); return TickRateModulation.SLEEP; } - this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) ); - final double dilation = this.burnSpeed / DILATION_SCALING; + this.setBurnSpeed( Math.max( MIN_BURN_SPEED, Math.min( this.getBurnSpeed(), MAX_BURN_SPEED ) ) ); + final double dilation = this.getBurnSpeed() / DILATION_SCALING; double timePassed = ticksSinceLastCall * dilation; - this.burnTime -= timePassed; - if( this.burnTime < 0 ) + this.setBurnTime( this.getBurnTime() - timePassed ); + if( this.getBurnTime() < 0 ) { - timePassed += this.burnTime; - this.burnTime = 0; + timePassed += this.getBurnTime(); + this.setBurnTime( 0 ); } try { - final IEnergyGrid grid = this.gridProxy.getEnergy(); + final IEnergyGrid grid = this.getGridProxy().getEnergy(); final double newPower = timePassed * POWER_PER_TICK; final double overFlow = grid.injectPower( newPower, Actionable.SIMULATE ); @@ -222,20 +222,20 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka if( overFlow > 0 ) { - this.burnSpeed -= ticksSinceLastCall; + this.setBurnSpeed( this.getBurnSpeed() - ticksSinceLastCall ); } else { - this.burnSpeed += ticksSinceLastCall; + this.setBurnSpeed( this.getBurnSpeed() + ticksSinceLastCall ); } - this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) ); + this.setBurnSpeed( Math.max( MIN_BURN_SPEED, Math.min( this.getBurnSpeed(), MAX_BURN_SPEED ) ) ); return overFlow > 0 ? TickRateModulation.SLOWER : TickRateModulation.FASTER; } catch( final GridAccessException e ) { - this.burnSpeed -= ticksSinceLastCall; - this.burnSpeed = Math.max( MIN_BURN_SPEED, Math.min( this.burnSpeed, MAX_BURN_SPEED ) ); + this.setBurnSpeed( this.getBurnSpeed() - ticksSinceLastCall ); + this.setBurnSpeed( Math.max( MIN_BURN_SPEED, Math.min( this.getBurnSpeed(), MAX_BURN_SPEED ) ) ); return TickRateModulation.SLOWER; } } @@ -248,8 +248,8 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka final int newBurnTime = TileEntityFurnace.getItemBurnTime( is ); if( newBurnTime > 0 && is.stackSize > 0 ) { - this.burnTime += newBurnTime; - this.maxBurnTime = this.burnTime; + this.setBurnTime( this.getBurnTime() + newBurnTime ); + this.setMaxBurnTime( this.getBurnTime() ); is.stackSize--; if( is.stackSize <= 0 ) { @@ -271,11 +271,11 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka } } - if( this.burnTime > 0 ) + if( this.getBurnTime() > 0 ) { try { - this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().wakeDevice( this.getGridProxy().getNode() ); } catch( final GridAccessException e ) { @@ -284,9 +284,9 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka } // state change - if( ( !this.isOn && this.burnTime > 0 ) || ( this.isOn && this.burnTime <= 0 ) ) + if( ( !this.isOn && this.getBurnTime() > 0 ) || ( this.isOn && this.getBurnTime() <= 0 ) ) { - this.isOn = this.burnTime > 0; + this.isOn = this.getBurnTime() > 0; this.markForUpdate(); if( this.hasWorldObj() ) @@ -295,4 +295,34 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka } } } + + public int getBurnSpeed() + { + return this.burnSpeed; + } + + private void setBurnSpeed( final int burnSpeed ) + { + this.burnSpeed = burnSpeed; + } + + public double getMaxBurnTime() + { + return this.maxBurnTime; + } + + private void setMaxBurnTime( final double maxBurnTime ) + { + this.maxBurnTime = maxBurnTime; + } + + public double getBurnTime() + { + return this.burnTime; + } + + private void setBurnTime( final double burnTime ) + { + this.burnTime = burnTime; + } } diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index 71ed27f8..3be0e9d5 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -59,32 +59,32 @@ import appeng.util.Platform; public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomCollision { - public CableBusContainer cb = new CableBusContainer( this ); + private CableBusContainer cb = new CableBusContainer( this ); + /** * Immibis MB Support */ - - boolean ImmibisMicroblocks_TransformableTileEntityMarker = true; + private boolean ImmibisMicroblocks_TransformableTileEntityMarker = true; private int oldLV = -1; // on re-calculate light when it changes @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_TileCableBus( final NBTTagCompound data ) { - this.cb.readFromNBT( data ); + this.getCableBus().readFromNBT( data ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_TileCableBus( final NBTTagCompound data ) { - this.cb.writeToNBT( data ); + this.getCableBus().writeToNBT( data ); } @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileCableBus( final ByteBuf data ) throws IOException { - final boolean ret = this.cb.readFromStream( data ); + final boolean ret = this.getCableBus().readFromStream( data ); - final int newLV = this.cb.getLightValue(); + final int newLV = this.getCableBus().getLightValue(); if( newLV != this.oldLV ) { this.oldLV = newLV; @@ -98,11 +98,11 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl protected void updateTileSetting() { - if( this.cb.requiresDynamicRender ) + if( this.getCableBus().isRequiresDynamicRender() ) { try { - final TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance(); + final TileCableBus tcb = (TileCableBus) BlockCableBus.getTesrTile().newInstance(); tcb.copyFrom( this ); this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb ); } @@ -115,16 +115,16 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl protected void copyFrom( final TileCableBus oldTile ) { - final CableBusContainer tmpCB = this.cb; - this.cb = oldTile.cb; + final CableBusContainer tmpCB = this.getCableBus(); + this.setCableBus( oldTile.getCableBus() ); this.oldLV = oldTile.oldLV; - oldTile.cb = tmpCB; + oldTile.setCableBus( tmpCB ); } @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileCableBus( final ByteBuf data ) throws IOException { - this.cb.writeToStream( data ); + this.getCableBus().writeToStream( data ); } @Override @@ -137,7 +137,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl public void invalidate() { super.invalidate(); - this.cb.removeFromWorld(); + this.getCableBus().removeFromWorld(); } @Override @@ -150,20 +150,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public IGridNode getGridNode( final ForgeDirection dir ) { - return this.cb.getGridNode( dir ); + return this.getCableBus().getGridNode( dir ); } @Override public AECableType getCableConnectionType( final ForgeDirection side ) { - return this.cb.getCableConnectionType( side ); + return this.getCableBus().getCableConnectionType( side ); } @Override public void onChunkUnload() { super.onChunkUnload(); - this.cb.removeFromWorld(); + this.getCableBus().removeFromWorld(); } @Override @@ -174,7 +174,7 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl return; } - final int newLV = this.cb.getLightValue(); + final int newLV = this.getCableBus().getLightValue(); if( newLV != this.oldLV ) { this.oldLV = newLV; @@ -194,20 +194,20 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public void getDrops( final World w, final int x, final int y, final int z, final List drops ) { - this.cb.getDrops( drops ); + this.getCableBus().getDrops( drops ); } @Override public void getNoDrops( final World w, final int x, final int y, final int z, final List drops ) { - this.cb.getNoDrops( drops ); + this.getCableBus().getNoDrops( drops ); } @Override public void onReady() { super.onReady(); - if( this.cb.isEmpty() ) + if( this.getCableBus().isEmpty() ) { if( this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord ) == this ) { @@ -216,44 +216,44 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } else { - this.cb.addToWorld(); + this.getCableBus().addToWorld(); } } @Override public boolean requiresTESR() { - return this.cb.requiresDynamicRender; + return this.getCableBus().isRequiresDynamicRender(); } @Override public IFacadeContainer getFacadeContainer() { - return this.cb.getFacadeContainer(); + return this.getCableBus().getFacadeContainer(); } @Override public boolean canAddPart( final ItemStack is, final ForgeDirection side ) { - return this.cb.canAddPart( is, side ); + return this.getCableBus().canAddPart( is, side ); } @Override public ForgeDirection addPart( final ItemStack is, final ForgeDirection side, final EntityPlayer player ) { - return this.cb.addPart( is, side, player ); + return this.getCableBus().addPart( is, side, player ); } @Override public IPart getPart( final ForgeDirection side ) { - return this.cb.getPart( side ); + return this.getCableBus().getPart( side ); } @Override public void removePart( final ForgeDirection side, final boolean suppressUpdate ) { - this.cb.removePart( side, suppressUpdate ); + this.getCableBus().removePart( side, suppressUpdate ); } @Override @@ -265,13 +265,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public AEColor getColor() { - return this.cb.getColor(); + return this.getCableBus().getColor(); } @Override public void clearContainer() { - this.cb = new CableBusContainer( this ); + this.setCableBus( new CableBusContainer( this ) ); } @Override @@ -283,13 +283,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public Iterable getSelectedBoundingBoxesFromPool( final World w, final int x, final int y, final int z, final Entity e, final boolean visual ) { - return this.cb.getSelectedBoundingBoxesFromPool( false, true, e, visual ); + return this.getCableBus().getSelectedBoundingBoxesFromPool( false, true, e, visual ); } @Override public SelectedPart selectPart( final Vec3 pos ) { - return this.cb.selectPart( pos ); + return this.getCableBus().selectPart( pos ); } @Override @@ -307,19 +307,19 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public boolean hasRedstone( final ForgeDirection side ) { - return this.cb.hasRedstone( side ); + return this.getCableBus().hasRedstone( side ); } @Override public boolean isEmpty() { - return this.cb.isEmpty(); + return this.getCableBus().isEmpty(); } @Override public Set getLayerFlags() { - return this.cb.getLayerFlags(); + return this.getCableBus().getLayerFlags(); } @Override @@ -358,23 +358,33 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl @Override public boolean isInWorld() { - return this.cb.isInWorld(); + return this.getCableBus().isInWorld(); } - public boolean ImmibisMicroblocks_isSideOpen( final int side ) + private boolean ImmibisMicroblocks_isSideOpen( final int side ) { return true; } public void ImmibisMicroblocks_onMicroblocksChanged() { - this.cb.updateConnections(); + this.getCableBus().updateConnections(); } @Override public boolean recolourBlock( final ForgeDirection side, final AEColor colour, final EntityPlayer who ) { - return this.cb.recolourBlock( side, colour, who ); + return this.getCableBus().recolourBlock( side, colour, who ); + } + + public CableBusContainer getCableBus() + { + return this.cb; + } + + private void setCableBus( final CableBusContainer cb ) + { + this.cb = cb; } } diff --git a/src/main/java/appeng/tile/networking/TileCableBusTESR.java b/src/main/java/appeng/tile/networking/TileCableBusTESR.java index 7e487c44..4e3711f8 100644 --- a/src/main/java/appeng/tile/networking/TileCableBusTESR.java +++ b/src/main/java/appeng/tile/networking/TileCableBusTESR.java @@ -28,11 +28,11 @@ public class TileCableBusTESR extends TileCableBus @Override protected void updateTileSetting() { - if( !this.cb.requiresDynamicRender ) + if( !this.getCableBus().isRequiresDynamicRender() ) { try { - final TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance(); + final TileCableBus tcb = (TileCableBus) BlockCableBus.getNoTesrTile().newInstance(); tcb.copyFrom( this ); this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb ); } diff --git a/src/main/java/appeng/tile/networking/TileController.java b/src/main/java/appeng/tile/networking/TileController.java index 50a4717e..4b4b6b54 100644 --- a/src/main/java/appeng/tile/networking/TileController.java +++ b/src/main/java/appeng/tile/networking/TileController.java @@ -49,10 +49,10 @@ public class TileController extends AENetworkPowerTile public TileController() { - this.internalMaxPower = 8000; - this.internalPublicPowerStorage = true; - this.gridProxy.setIdlePowerUsage( 3 ); - this.gridProxy.setFlags( GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY ); + this.setInternalMaxPower( 8000 ); + this.setInternalPublicPowerStorage( true ); + this.getProxy().setIdlePowerUsage( 3 ); + this.getProxy().setFlags( GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY ); } @Override @@ -86,11 +86,11 @@ public class TileController extends AENetworkPowerTile { if( this.isValid ) { - this.gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) ); + this.getProxy().setValidSides( EnumSet.allOf( ForgeDirection.class ) ); } else { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } this.updateMeta(); @@ -100,7 +100,7 @@ public class TileController extends AENetworkPowerTile private void updateMeta() { - if( !this.gridProxy.isReady() ) + if( !this.getProxy().isReady() ) { return; } @@ -109,11 +109,11 @@ public class TileController extends AENetworkPowerTile try { - if( this.gridProxy.getEnergy().isNetworkPowered() ) + if( this.getProxy().getEnergy().isNetworkPowered() ) { meta = 1; - if( this.gridProxy.getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT ) + if( this.getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT ) { meta = 2; } @@ -135,7 +135,7 @@ public class TileController extends AENetworkPowerTile { try { - return this.gridProxy.getEnergy().getEnergyDemand( 8000 ); + return this.getProxy().getEnergy().getEnergyDemand( 8000 ); } catch( final GridAccessException e ) { @@ -149,7 +149,7 @@ public class TileController extends AENetworkPowerTile { try { - final double ret = this.gridProxy.getEnergy().injectPower( power, mode ); + final double ret = this.getProxy().getEnergy().injectPower( power, mode ); if( mode == Actionable.SIMULATE ) { return ret; @@ -168,7 +168,7 @@ public class TileController extends AENetworkPowerTile { try { - this.gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, x ) ); + this.getProxy().getGrid().postEvent( new MENetworkPowerStorage( this, x ) ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java b/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java index 79471398..439ed9e8 100644 --- a/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java @@ -34,7 +34,7 @@ public class TileCreativeEnergyCell extends AENetworkTile implements IAEPowerSto public TileCreativeEnergyCell() { - this.gridProxy.setIdlePowerUsage( 0 ); + this.getProxy().setIdlePowerUsage( 0 ); } @Override diff --git a/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java b/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java index 32eb4ee7..7c2a8dee 100644 --- a/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileDenseEnergyCell.java @@ -24,6 +24,6 @@ public class TileDenseEnergyCell extends TileEnergyCell public TileDenseEnergyCell() { - this.internalMaxPower = 200000 * 8; + this.setInternalMaxPower( 200000 * 8 ); } } diff --git a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java index 0a9341b1..f86bd5ba 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java +++ b/src/main/java/appeng/tile/networking/TileEnergyAcceptor.java @@ -36,13 +36,13 @@ import appeng.tile.inventory.InvOperation; public class TileEnergyAcceptor extends AENetworkPowerTile { - static final AppEngInternalInventory INTERNAL_INVENTORY = new AppEngInternalInventory( null, 0 ); - final int[] sides = {}; + private static final AppEngInternalInventory INTERNAL_INVENTORY = new AppEngInternalInventory( null, 0 ); + private final int[] sides = {}; public TileEnergyAcceptor() { - this.gridProxy.setIdlePowerUsage( 0.0 ); - this.internalMaxPower = 0; + this.getProxy().setIdlePowerUsage( 0.0 ); + this.setInternalMaxPower( 0 ); } @Override @@ -72,12 +72,12 @@ public class TileEnergyAcceptor extends AENetworkPowerTile { try { - final IEnergyGrid grid = this.gridProxy.getEnergy(); + final IEnergyGrid grid = this.getProxy().getEnergy(); return grid.getEnergyDemand( maxRequired ); } catch( final GridAccessException e ) { - return this.internalMaxPower; + return this.getInternalMaxPower(); } } @@ -86,7 +86,7 @@ public class TileEnergyAcceptor extends AENetworkPowerTile { try { - final IEnergyGrid grid = this.gridProxy.getEnergy(); + final IEnergyGrid grid = this.getProxy().getEnergy(); final double leftOver = grid.injectPower( power, mode ); if( mode == Actionable.SIMULATE ) { diff --git a/src/main/java/appeng/tile/networking/TileEnergyCell.java b/src/main/java/appeng/tile/networking/TileEnergyCell.java index 320cd568..dcb1a533 100644 --- a/src/main/java/appeng/tile/networking/TileEnergyCell.java +++ b/src/main/java/appeng/tile/networking/TileEnergyCell.java @@ -39,14 +39,14 @@ import appeng.util.SettingsFrom; public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage { - protected double internalCurrentPower = 0.0; - protected double internalMaxPower = 200000.0; + private double internalCurrentPower = 0.0; + private double internalMaxPower = 200000.0; private byte currentMeta = -1; public TileEnergyCell() { - this.gridProxy.setIdlePowerUsage( 0 ); + this.getProxy().setIdlePowerUsage( 0 ); } @Override @@ -70,7 +70,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage return; } - byte boundMetadata = (byte) ( 8.0 * ( this.internalCurrentPower / this.internalMaxPower ) ); + byte boundMetadata = (byte) ( 8.0 * ( this.internalCurrentPower / this.getInternalMaxPower() ) ); if( boundMetadata > 7 ) { @@ -125,7 +125,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage { final NBTTagCompound tag = new NBTTagCompound(); tag.setDouble( "internalCurrentPower", this.internalCurrentPower ); - tag.setDouble( "internalMaxPower", this.internalMaxPower ); // used for tool tip. + tag.setDouble( "internalMaxPower", this.getInternalMaxPower() ); // used for tool tip. return tag; } return null; @@ -137,9 +137,9 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage if( mode == Actionable.SIMULATE ) { final double fakeBattery = this.internalCurrentPower + amt; - if( fakeBattery > this.internalMaxPower ) + if( fakeBattery > this.getInternalMaxPower() ) { - return fakeBattery - this.internalMaxPower; + return fakeBattery - this.getInternalMaxPower(); } return 0; @@ -147,14 +147,14 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage if( this.internalCurrentPower < 0.01 && amt > 0.01 ) { - this.gridProxy.getNode().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.PROVIDE_POWER ) ); + this.getProxy().getNode().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.PROVIDE_POWER ) ); } this.internalCurrentPower += amt; - if( this.internalCurrentPower > this.internalMaxPower ) + if( this.internalCurrentPower > this.getInternalMaxPower() ) { - amt = this.internalCurrentPower - this.internalMaxPower; - this.internalCurrentPower = this.internalMaxPower; + amt = this.internalCurrentPower - this.getInternalMaxPower(); + this.internalCurrentPower = this.getInternalMaxPower(); this.changePowerLevel(); return amt; @@ -167,7 +167,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage @Override public double getAEMaxPower() { - return this.internalMaxPower; + return this.getInternalMaxPower(); } @Override @@ -205,13 +205,13 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage return this.internalCurrentPower; } - final boolean wasFull = this.internalCurrentPower >= this.internalMaxPower - 0.001; + final boolean wasFull = this.internalCurrentPower >= this.getInternalMaxPower() - 0.001; if( wasFull && amt > 0.001 ) { try { - this.gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) ); + this.getProxy().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) ); } catch( final GridAccessException ignored ) { @@ -233,4 +233,14 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage this.changePowerLevel(); return amt; } + + private double getInternalMaxPower() + { + return this.internalMaxPower; + } + + void setInternalMaxPower( final double internalMaxPower ) + { + this.internalMaxPower = internalMaxPower; + } } diff --git a/src/main/java/appeng/tile/networking/TileWireless.java b/src/main/java/appeng/tile/networking/TileWireless.java index ac488725..01c08af0 100644 --- a/src/main/java/appeng/tile/networking/TileWireless.java +++ b/src/main/java/appeng/tile/networking/TileWireless.java @@ -53,22 +53,22 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi public static final int POWERED_FLAG = 1; public static final int CHANNEL_FLAG = 2; - final int[] sides = { 0 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 1 ); + private final int[] sides = { 0 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 1 ); - public int clientFlags = 0; + private int clientFlags = 0; public TileWireless() { - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getGridProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getGridProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } @Override public void setOrientation( final ForgeDirection inForward, final ForgeDirection inUp ) { super.setOrientation( inForward, inUp ); - this.gridProxy.setValidSides( EnumSet.of( this.getForward().getOpposite() ) ); + this.getGridProxy().setValidSides( EnumSet.of( this.getForward().getOpposite() ) ); } @MENetworkEventSubscribe @@ -86,27 +86,27 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileWireless( final ByteBuf data ) { - final int old = this.clientFlags; - this.clientFlags = data.readByte(); + final int old = this.getClientFlags(); + this.setClientFlags( data.readByte() ); - return old != this.clientFlags; + return old != this.getClientFlags(); } @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileWireless( final ByteBuf data ) { - this.clientFlags = 0; + this.setClientFlags( 0 ); try { - if( this.gridProxy.getEnergy().isNetworkPowered() ) + if( this.getGridProxy().getEnergy().isNetworkPowered() ) { - this.clientFlags |= POWERED_FLAG; + this.setClientFlags( this.getClientFlags() | POWERED_FLAG ); } - if( this.gridProxy.getNode().meetsChannelRequirements() ) + if( this.getGridProxy().getNode().meetsChannelRequirements() ) { - this.clientFlags |= CHANNEL_FLAG; + this.setClientFlags( this.getClientFlags() | CHANNEL_FLAG ); } } catch( final GridAccessException e ) @@ -114,7 +114,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi // meh } - data.writeByte( (byte) this.clientFlags ); + data.writeByte( (byte) this.getClientFlags() ); } @Override @@ -162,7 +162,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi private void updatePower() { - this.gridProxy.setIdlePowerUsage( AEConfig.instance.wireless_getPowerDrain( this.getBoosters() ) ); + this.getGridProxy().setIdlePowerUsage( AEConfig.instance.wireless_getPowerDrain( this.getBoosters() ) ); } private int getBoosters() @@ -188,10 +188,10 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi { if( Platform.isClient() ) { - return this.isPowered() && ( CHANNEL_FLAG == ( this.clientFlags & CHANNEL_FLAG ) ); + return this.isPowered() && ( CHANNEL_FLAG == ( this.getClientFlags() & CHANNEL_FLAG ) ); } - return this.gridProxy.isActive(); + return this.getGridProxy().isActive(); } @Override @@ -199,7 +199,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi { try { - return this.gridProxy.getGrid(); + return this.getGridProxy().getGrid(); } catch( final GridAccessException e ) { @@ -210,6 +210,16 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi @Override public boolean isPowered() { - return POWERED_FLAG == ( this.clientFlags & POWERED_FLAG ); + return POWERED_FLAG == ( this.getClientFlags() & POWERED_FLAG ); + } + + public int getClientFlags() + { + return this.clientFlags; + } + + private void setClientFlags( final int clientFlags ) + { + this.clientFlags = clientFlags; } } diff --git a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java index 4c4eb156..3d284b85 100644 --- a/src/main/java/appeng/tile/powersink/AERootPoweredTile.java +++ b/src/main/java/appeng/tile/powersink/AERootPoweredTile.java @@ -38,14 +38,13 @@ import appeng.tile.events.TileEventType; public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowerStorage { - protected final boolean internalCanAcceptPower = true; // values that determine general function, are set by inheriting classes if // needed. These should generally remain static. - protected double internalMaxPower = 10000; - protected boolean internalPublicPowerStorage = false; - protected AccessRestriction internalPowerFlow = AccessRestriction.READ_WRITE; + private double internalMaxPower = 10000; + private boolean internalPublicPowerStorage = false; + private AccessRestriction internalPowerFlow = AccessRestriction.READ_WRITE; // the current power buffer. - protected double internalCurrentPower = 0; + private double internalCurrentPower = 0; private EnumSet internalPowerSides = EnumSet.allOf( ForgeDirection.class ); protected EnumSet getPowerSides() @@ -62,13 +61,13 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe @TileEvent( TileEventType.WORLD_NBT_WRITE ) public void writeToNBT_AERootPoweredTile( final NBTTagCompound data ) { - data.setDouble( "internalCurrentPower", this.internalCurrentPower ); + data.setDouble( "internalCurrentPower", this.getInternalCurrentPower() ); } @TileEvent( TileEventType.WORLD_NBT_READ ) public void readFromNBT_AERootPoweredTile( final NBTTagCompound data ) { - this.internalCurrentPower = data.getDouble( "internalCurrentPower" ); + this.setInternalCurrentPower( data.getDouble( "internalCurrentPower" ) ); } protected final double getExternalPowerDemand( final PowerUnits externalUnit, final double maxPowerRequired ) @@ -78,7 +77,7 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe protected double getFunnelPowerDemand( final double maxRequired ) { - return this.internalMaxPower - this.internalCurrentPower; + return this.getInternalMaxPower() - this.getInternalCurrentPower(); } public final double injectExternalPower( final PowerUnits input, final double amt ) @@ -101,27 +100,27 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe if( mode == Actionable.SIMULATE ) { - final double fakeBattery = this.internalCurrentPower + amt; + final double fakeBattery = this.getInternalCurrentPower() + amt; - if( fakeBattery > this.internalMaxPower ) + if( fakeBattery > this.getInternalMaxPower() ) { - return fakeBattery - this.internalMaxPower; + return fakeBattery - this.getInternalMaxPower(); } return 0; } else { - if( this.internalCurrentPower < 0.01 && amt > 0.01 ) + if( this.getInternalCurrentPower() < 0.01 && amt > 0.01 ) { this.PowerEvent( PowerEventType.PROVIDE_POWER ); } - this.internalCurrentPower += amt; - if( this.internalCurrentPower > this.internalMaxPower ) + this.setInternalCurrentPower( this.getInternalCurrentPower() + amt ); + if( this.getInternalCurrentPower() > this.getInternalMaxPower() ) { - amt = this.internalCurrentPower - this.internalMaxPower; - this.internalCurrentPower = this.internalMaxPower; + amt = this.getInternalCurrentPower() - this.getInternalMaxPower(); + this.setInternalCurrentPower( this.getInternalMaxPower() ); return amt; } @@ -137,25 +136,25 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe @Override public final double getAEMaxPower() { - return this.internalMaxPower; + return this.getInternalMaxPower(); } @Override public final double getAECurrentPower() { - return this.internalCurrentPower; + return this.getInternalCurrentPower(); } @Override public final boolean isAEPublicPowerStorage() { - return this.internalPublicPowerStorage; + return this.isInternalPublicPowerStorage(); } @Override public final AccessRestriction getPowerFlow() { - return this.internalPowerFlow; + return this.getInternalPowerFlow(); } @Override @@ -168,27 +167,67 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe { if( mode == Actionable.SIMULATE ) { - if( this.internalCurrentPower > amt ) + if( this.getInternalCurrentPower() > amt ) { return amt; } - return this.internalCurrentPower; + return this.getInternalCurrentPower(); } - final boolean wasFull = this.internalCurrentPower >= this.internalMaxPower - 0.001; + final boolean wasFull = this.getInternalCurrentPower() >= this.getInternalMaxPower() - 0.001; if( wasFull && amt > 0.001 ) { this.PowerEvent( PowerEventType.REQUEST_POWER ); } - if( this.internalCurrentPower > amt ) + if( this.getInternalCurrentPower() > amt ) { - this.internalCurrentPower -= amt; + this.setInternalCurrentPower( this.getInternalCurrentPower() - amt ); return amt; } - amt = this.internalCurrentPower; - this.internalCurrentPower = 0; + amt = this.getInternalCurrentPower(); + this.setInternalCurrentPower( 0 ); return amt; } + + public double getInternalCurrentPower() + { + return this.internalCurrentPower; + } + + public void setInternalCurrentPower( final double internalCurrentPower ) + { + this.internalCurrentPower = internalCurrentPower; + } + + public double getInternalMaxPower() + { + return this.internalMaxPower; + } + + public void setInternalMaxPower( final double internalMaxPower ) + { + this.internalMaxPower = internalMaxPower; + } + + private boolean isInternalPublicPowerStorage() + { + return this.internalPublicPowerStorage; + } + + public void setInternalPublicPowerStorage( final boolean internalPublicPowerStorage ) + { + this.internalPublicPowerStorage = internalPublicPowerStorage; + } + + private AccessRestriction getInternalPowerFlow() + { + return this.internalPowerFlow; + } + + public void setInternalPowerFlow( final AccessRestriction internalPowerFlow ) + { + this.internalPowerFlow = internalPowerFlow; + } } diff --git a/src/main/java/appeng/tile/powersink/IC2.java b/src/main/java/appeng/tile/powersink/IC2.java index 89815dba..5878a02f 100644 --- a/src/main/java/appeng/tile/powersink/IC2.java +++ b/src/main/java/appeng/tile/powersink/IC2.java @@ -38,7 +38,7 @@ import appeng.util.Platform; public abstract class IC2 extends AERootPoweredTile implements IEnergySink { - boolean isInIC2 = false; + private boolean isInIC2 = false; @Override public final boolean acceptsEnergyFrom( final TileEntity emitter, final ForgeDirection direction ) @@ -64,7 +64,7 @@ public abstract class IC2 extends AERootPoweredTile implements IEnergySink // just store the excess in the current block, if I return the waste, // IC2 will just disintegrate it - Oct 20th 2013 final double overflow = PowerUnits.EU.convertTo( PowerUnits.AE, this.injectExternalPower( PowerUnits.EU, amount ) ); - this.internalCurrentPower += overflow; + this.setInternalCurrentPower( this.getInternalCurrentPower() + overflow ); return 0; // see above comment. } diff --git a/src/main/java/appeng/tile/powersink/MekJoules.java b/src/main/java/appeng/tile/powersink/MekJoules.java index f0609463..744fe5b4 100644 --- a/src/main/java/appeng/tile/powersink/MekJoules.java +++ b/src/main/java/appeng/tile/powersink/MekJoules.java @@ -42,7 +42,7 @@ public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcc public void setEnergy( final double energy ) { final double extra = this.injectExternalPower( PowerUnits.MK, energy ); - this.internalCurrentPower += PowerUnits.MK.convertTo( PowerUnits.AE, extra ); + this.setInternalCurrentPower( this.getInternalCurrentPower() + PowerUnits.MK.convertTo( PowerUnits.AE, extra ) ); } @Override diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 31757256..98a59778 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -54,25 +54,23 @@ import appeng.util.Platform; public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { - private static final IBlockDefinition RING_DEFINITION = AEApi.instance().definitions().blocks().quantumRing(); - public final byte corner = 16; - final int[] sidesRing = {}; - final int[] sidesLink = { 0 }; - final AppEngInternalInventory internalInventory = new AppEngInternalInventory( this, 1 ); - final byte hasSingularity = 32; - final byte powered = 64; + private final byte corner = 16; + private final int[] sidesRing = {}; + private final int[] sidesLink = { 0 }; + private final AppEngInternalInventory internalInventory = new AppEngInternalInventory( this, 1 ); + private final byte hasSingularity = 32; + private final byte powered = 64; private final QuantumCalculator calc = new QuantumCalculator( this ); - public boolean bridgePowered; - byte constructed = -1; - QuantumCluster cluster; + private byte constructed = -1; + private QuantumCluster cluster; private boolean updateStatus = false; public TileQuantumBridge() { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); - this.gridProxy.setFlags( GridFlags.DENSE_CAPACITY ); - this.gridProxy.setIdlePowerUsage( 22 ); + this.getGridProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getGridProxy().setFlags( GridFlags.DENSE_CAPACITY ); + this.getGridProxy().setIdlePowerUsage( 22 ); this.internalInventory.setMaxStackSize( 1 ); } @@ -100,7 +98,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock out |= this.hasSingularity; } - if( this.gridProxy.isActive() && this.constructed != -1 ) + if( this.getGridProxy().isActive() && this.constructed != -1 ) { out |= this.powered; } @@ -113,7 +111,6 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { final int oldValue = this.constructed; this.constructed = data.readByte(); - this.bridgePowered = ( this.constructed | this.powered ) == this.powered; return this.constructed != oldValue; } @@ -142,7 +139,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock return this.sidesRing; } - public boolean isCenter() + private boolean isCenter() { for( final Block link : AEApi.instance().definitions().blocks().quantumLink().maybeBlock().asSet() ) { @@ -180,7 +177,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { final ItemStack linkStack = maybeLinkStack.get(); - this.gridProxy.setVisualRepresentation( linkStack ); + this.getGridProxy().setVisualRepresentation( linkStack ); } } @@ -198,7 +195,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { if( !affectWorld ) { - this.cluster.updateStatus = false; + this.cluster.setUpdateStatus( false ); } this.cluster.destroy(); @@ -208,7 +205,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock if( affectWorld ) { - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getGridProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } } @@ -238,18 +235,18 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock if( this.isCorner() || this.isCenter() ) { - this.gridProxy.setValidSides( this.getConnections() ); + this.getGridProxy().setValidSides( this.getConnections() ); } else { - this.gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) ); + this.getGridProxy().setValidSides( EnumSet.allOf( ForgeDirection.class ) ); } } } public boolean isCorner() { - return ( this.constructed & this.corner ) == this.corner && this.constructed != -1; + return ( this.constructed & this.getCorner() ) == this.getCorner() && this.constructed != -1; } public EnumSet getConnections() @@ -291,7 +288,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock try { - return this.gridProxy.getEnergy().isNetworkPowered(); + return this.getGridProxy().getEnergy().isNetworkPowered(); } catch( final GridAccessException e ) { @@ -339,4 +336,9 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock this.cluster.destroy(); } } + + public byte getCorner() + { + return this.corner; + } } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index 821a6f3f..f7ab629e 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -52,13 +52,13 @@ import appeng.util.Platform; public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallable { - final int[] sides = { 0, 1 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 ); - YesNo lastRedstoneState = YesNo.UNDECIDED; + private final int[] sides = { 0, 1 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 ); + private YesNo lastRedstoneState = YesNo.UNDECIDED; public TileSpatialIOPort() { - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getGridProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); } @TileEvent( TileEventType.WORLD_NBT_WRITE ) @@ -127,8 +127,8 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl final ItemStack cell = this.getStackInSlot( 0 ); if( this.isSpatialCell( cell ) && this.getStackInSlot( 1 ) == null ) { - final IGrid gi = this.gridProxy.getGrid(); - final IEnergyGrid energy = this.gridProxy.getEnergy(); + final IGrid gi = this.getGridProxy().getGrid(); + final IEnergyGrid energy = this.getGridProxy().getEnergy(); final ISpatialStorageCell sc = (ISpatialStorageCell) cell.getItem(); diff --git a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java index c5e64492..43f3cf37 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java @@ -54,16 +54,17 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock public static final int DISPLAY_ENABLED = 0x10; public static final int DISPLAY_POWERED_ENABLED = 0x20; public static final int NET_STATUS = 0x10 + 0x20; - final SpatialPylonCalculator calc = new SpatialPylonCalculator( this ); - int displayBits = 0; - SpatialPylonCluster cluster; - boolean didHaveLight = false; + + private final SpatialPylonCalculator calc = new SpatialPylonCalculator( this ); + private int displayBits = 0; + private SpatialPylonCluster cluster; + private boolean didHaveLight = false; public TileSpatialPylon() { - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK ); - this.gridProxy.setIdlePowerUsage( 0.5 ); - this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK ); + this.getProxy().setIdlePowerUsage( 0.5 ); + this.getProxy().setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); } @Override @@ -123,7 +124,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock public void updateStatus( final SpatialPylonCluster c ) { this.cluster = c; - this.gridProxy.setValidSides( c == null ? EnumSet.noneOf( ForgeDirection.class ) : EnumSet.allOf( ForgeDirection.class ) ); + this.getProxy().setValidSides( c == null ? EnumSet.noneOf( ForgeDirection.class ) : EnumSet.allOf( ForgeDirection.class ) ); this.recalculateDisplay(); } @@ -135,11 +136,11 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock if( this.cluster != null ) { - if( this.cluster.min.equals( this.getLocation() ) ) + if( this.cluster.getMin().equals( this.getLocation() ) ) { this.displayBits = DISPLAY_END_MIN; } - else if( this.cluster.max.equals( this.getLocation() ) ) + else if( this.cluster.getMax().equals( this.getLocation() ) ) { this.displayBits = DISPLAY_END_MAX; } @@ -148,7 +149,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock this.displayBits = DISPLAY_MIDDLE; } - switch( this.cluster.currentAxis ) + switch( this.cluster.getCurrentAxis() ) { case X: this.displayBits |= DISPLAY_X; @@ -166,12 +167,12 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock try { - if( this.gridProxy.getEnergy().isNetworkPowered() ) + if( this.getProxy().getEnergy().isNetworkPowered() ) { this.displayBits |= DISPLAY_POWERED_ENABLED; } - if( this.cluster.isValid && this.gridProxy.isActive() ) + if( this.cluster.isValid() && this.getProxy().isActive() ) { this.displayBits |= DISPLAY_ENABLED; } diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 082a3fd0..d32ea1b1 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -95,34 +95,34 @@ import appeng.util.item.AEFluidStack; public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHandler, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile { - static final ChestNoHandler NO_HANDLER = new ChestNoHandler(); - static final int[] SIDES = { 0 }; - static final int[] FRONT = { 1 }; - static final int[] NO_SLOTS = {}; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 ); - final BaseActionSource mySrc = new MachineSource( this ); - final IConfigManager config = new ConfigManager( this ); - ItemStack storageType; - long lastStateChange = 0; - int priority = 0; - int state = 0; - boolean wasActive = false; - AEColor paintedColor = AEColor.Transparent; - boolean isCached = false; + private static final ChestNoHandler NO_HANDLER = new ChestNoHandler(); + private static final int[] SIDES = { 0 }; + private static final int[] FRONT = { 1 }; + private static final int[] NO_SLOTS = {}; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 2 ); + private final BaseActionSource mySrc = new MachineSource( this ); + private final IConfigManager config = new ConfigManager( this ); + private ItemStack storageType; + private long lastStateChange = 0; + private int priority = 0; + private int state = 0; + private boolean wasActive = false; + private AEColor paintedColor = AEColor.Transparent; + private boolean isCached = false; private ICellHandler cellHandler; private MEMonitorHandler itemCell; private MEMonitorHandler fluidCell; public TileChest() { - this.internalMaxPower = PowerMultiplier.CONFIG.multiply( 40 ); - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); + this.setInternalMaxPower( PowerMultiplier.CONFIG.multiply( 40 ) ); + this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); this.config.registerSetting( Settings.SORT_BY, SortOrder.NAME ); this.config.registerSetting( Settings.VIEW_MODE, ViewItems.ALL ); this.config.registerSetting( Settings.SORT_DIRECTION, SortDir.ASCENDING ); - this.internalPublicPowerStorage = true; - this.internalPowerFlow = AccessRestriction.WRITE; + this.setInternalPublicPowerStorage( true ); + this.setInternalPowerFlow( AccessRestriction.WRITE ); } @Override @@ -132,7 +132,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan { try { - this.gridProxy.getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) ); + this.getProxy().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) ); } catch( final GridAccessException e ) { @@ -163,13 +163,13 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan this.state &= ~0x40; } - final boolean currentActive = this.gridProxy.isActive(); + final boolean currentActive = this.getProxy().isActive(); if( this.wasActive != currentActive ) { this.wasActive = currentActive; try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { @@ -189,7 +189,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return 1; } - public IMEInventoryHandler getHandler( final StorageChannel channel ) throws ChestNoHandler + private IMEInventoryHandler getHandler( final StorageChannel channel ) throws ChestNoHandler { if( !this.isCached ) { @@ -217,7 +217,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan power += this.cellHandler.cellIdleDrain( is, fluidCell ); } - this.gridProxy.setIdlePowerUsage( power ); + this.getProxy().setIdlePowerUsage( power ); this.itemCell = this.wrap( itemCell ); this.fluidCell = this.wrap( fluidCell ); @@ -316,7 +316,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan { try { - gridPowered = this.gridProxy.getEnergy().isNetworkPowered(); + gridPowered = this.getProxy().getEnergy().isNetworkPowered(); } catch( final GridAccessException ignored ) { @@ -345,7 +345,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan try { - final IEnergyGrid eg = this.gridProxy.getEnergy(); + final IEnergyGrid eg = this.getProxy().getEnergy(); stash = eg.extractAEPower( amt, mode, PowerMultiplier.ONE ); if( stash >= amt ) { @@ -369,11 +369,11 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return; } - final double idleUsage = this.gridProxy.getIdlePowerUsage(); + final double idleUsage = this.getProxy().getIdlePowerUsage(); try { - if( !this.gridProxy.getEnergy().isNetworkPowered() ) + if( !this.getProxy().getEnergy().isNetworkPowered() ) { final double powerUsed = this.extractAEPower( idleUsage, Actionable.MODULATE, PowerMultiplier.CONFIG ); // drain if( powerUsed + 0.1 >= idleUsage != ( this.state & 0x40 ) > 0 ) @@ -384,7 +384,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan } catch( final GridAccessException e ) { - final double powerUsed = this.extractAEPower( this.gridProxy.getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG ); // drain + final double powerUsed = this.extractAEPower( this.getProxy().getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG ); // drain if( powerUsed + 0.1 >= idleUsage != ( this.state & 0x40 ) > 0 ) { this.recalculateDisplay(); @@ -531,9 +531,9 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); - final IStorageGrid gs = this.gridProxy.getStorage(); + final IStorageGrid gs = this.getProxy().getStorage(); Platform.postChanges( gs, removed, added, this.mySrc ); } catch( final GridAccessException ignored ) @@ -638,7 +638,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan @Override public List getCellArray( final StorageChannel channel ) { - if( this.gridProxy.isActive() ) + if( this.getProxy().isActive() ) { try { @@ -669,7 +669,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { @@ -773,7 +773,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan @Override public IStorageMonitorable getMonitorable( final ForgeDirection side, final BaseActionSource src ) { - if( Platform.canAccess( this.gridProxy, src ) && side != this.getForward() ) + if( Platform.canAccess( this.getProxy(), src ) && side != this.getForward() ) { return this; } @@ -865,10 +865,10 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan private static final long serialVersionUID = 7995805326136526631L; } - class ChestNetNotifier> implements IMEMonitorHandlerReceiver + private class ChestNetNotifier> implements IMEMonitorHandlerReceiver { - final StorageChannel chan; + private final StorageChannel chan; public ChestNetNotifier( final StorageChannel chan ) { @@ -896,9 +896,9 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan { try { - if( TileChest.this.gridProxy.isActive() ) + if( TileChest.this.getProxy().isActive() ) { - TileChest.this.gridProxy.getStorage().postAlterationOfStoredItems( this.chan, change, TileChest.this.mySrc ); + TileChest.this.getProxy().getStorage().postAlterationOfStoredItems( this.chan, change, TileChest.this.mySrc ); } } catch( final GridAccessException e ) @@ -917,7 +917,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan } } - class ChestMonitorHandler extends MEMonitorHandler + private class ChestMonitorHandler extends MEMonitorHandler { public ChestMonitorHandler( final IMEInventoryHandler t ) @@ -925,7 +925,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan super( t ); } - public IMEInventoryHandler getInternalHandler() + private IMEInventoryHandler getInternalHandler() { final IMEInventoryHandler h = this.getHandler(); if( h instanceof MEInventoryHandler ) diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 2d5df522..f2efc6f5 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -62,23 +62,23 @@ import appeng.util.Platform; public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPriorityHost { - final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 10 ); - final ICellHandler[] handlersBySlot = new ICellHandler[10]; - final DriveWatcher[] invBySlot = new DriveWatcher[10]; - final BaseActionSource mySrc; - boolean isCached = false; - List items = new LinkedList(); - List fluids = new LinkedList(); - long lastStateChange = 0; - int state = 0; - int priority = 0; - boolean wasActive = false; + private final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 10 ); + private final ICellHandler[] handlersBySlot = new ICellHandler[10]; + private final DriveWatcher[] invBySlot = new DriveWatcher[10]; + private final BaseActionSource mySrc; + private boolean isCached = false; + private List items = new LinkedList(); + private List fluids = new LinkedList(); + private long lastStateChange = 0; + private int state = 0; + private int priority = 0; + private boolean wasActive = false; public TileDrive() { this.mySrc = new MachineSource( this ); - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getGridProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); } @TileEvent( TileEventType.NETWORK_WRITE ) @@ -93,7 +93,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior this.state &= 0x24924924; // just keep the blinks... } - if( this.gridProxy.isActive() ) + if( this.getGridProxy().isActive() ) { this.state |= 0x80000000; } @@ -160,7 +160,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior return ( this.state & 0x80000000 ) == 0x80000000; } - return this.gridProxy.isActive(); + return this.getGridProxy().isActive(); } @Override @@ -205,7 +205,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior private void recalculateDisplay() { - final boolean currentActive = this.gridProxy.isActive(); + final boolean currentActive = this.getGridProxy().isActive(); if( currentActive ) { this.state |= 0x80000000; @@ -220,7 +220,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior this.wasActive = currentActive; try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getGridProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { @@ -281,9 +281,9 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getGridProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); - final IStorageGrid gs = this.gridProxy.getStorage(); + final IStorageGrid gs = this.getGridProxy().getStorage(); Platform.postChanges( gs, removed, added, this.mySrc ); } catch( final GridAccessException ignored ) @@ -299,7 +299,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior return this.sides; } - public void updateState() + private void updateState() { if( !this.isCached ) { @@ -349,7 +349,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior } } - this.gridProxy.setIdlePowerUsage( power ); + this.getGridProxy().setIdlePowerUsage( power ); this.isCached = true; } @@ -365,7 +365,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior @Override public List getCellArray( final StorageChannel channel ) { - if( this.gridProxy.isActive() ) + if( this.getGridProxy().isActive() ) { this.updateState(); return (List) ( channel == StorageChannel.ITEMS ? this.items : this.fluids ); @@ -390,7 +390,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior try { - this.gridProxy.getGrid().postEvent( new MENetworkCellArrayUpdate() ); + this.getGridProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index f1fe4b1a..de7c3592 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -106,7 +106,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC @Reflected public TileIOPort() { - this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); + this.getGridProxy().setFlags( GridFlags.REQUIRE_CHANNEL ); this.manager = new ConfigManager( this ); this.manager.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE ); this.manager.registerSetting( Settings.FULLNESS_MODE, FullnessMode.EMPTY ); @@ -158,11 +158,11 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC { if( this.hasWork() ) { - this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().wakeDevice( this.getGridProxy().getNode() ); } else { - this.gridProxy.getTick().sleepDevice( this.gridProxy.getNode() ); + this.getGridProxy().getTick().sleepDevice( this.getGridProxy().getNode() ); } } catch( final GridAccessException e ) @@ -181,7 +181,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC } } - public boolean getRedstoneState() + private boolean getRedstoneState() { if( this.lastRedstoneState == YesNo.UNDECIDED ) { @@ -234,7 +234,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC this.updateTask(); } - boolean hasWork() + private boolean hasWork() { if( this.isEnabled() ) { @@ -307,13 +307,13 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC @Override public TickingRequest getTickingRequest( final IGridNode node ) { - return new TickingRequest( TickRates.IOPort.min, TickRates.IOPort.max, this.hasWork(), false ); + return new TickingRequest( TickRates.IOPort.getMin(), TickRates.IOPort.getMax(), this.hasWork(), false ); } @Override public TickRateModulation tickingRequest( final IGridNode node, final int ticksSinceLastCall ) { - if( !this.gridProxy.isActive() ) + if( !this.getGridProxy().isActive() ) { return TickRateModulation.IDLE; } @@ -335,9 +335,9 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC try { - final IMEInventory itemNet = this.gridProxy.getStorage().getItemInventory(); - final IMEInventory fluidNet = this.gridProxy.getStorage().getFluidInventory(); - final IEnergySource energy = this.gridProxy.getEnergy(); + final IMEInventory itemNet = this.getGridProxy().getStorage().getItemInventory(); + final IMEInventory fluidNet = this.getGridProxy().getStorage().getFluidInventory(); + final IEnergySource energy = this.getGridProxy().getEnergy(); for( int x = 0; x < 6; x++ ) { final ItemStack is = this.cells.getStackInSlot( x ); diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index 86dd143e..10e6ae19 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -36,29 +36,29 @@ import appeng.util.Platform; public class TileSkyChest extends AEBaseInvTile { - final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 }; - final AppEngInternalInventory inv = new AppEngInternalInventory( this, 9 * 4 ); + private final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 }; + private final AppEngInternalInventory inv = new AppEngInternalInventory( this, 9 * 4 ); // server - public int playerOpen; + private int playerOpen; // client.. - public long lastEvent; - public float lidAngle; + private long lastEvent; + private float lidAngle; @TileEvent( TileEventType.NETWORK_WRITE ) public void writeToStream_TileSkyChest( final ByteBuf data ) { - data.writeBoolean( this.playerOpen > 0 ); + data.writeBoolean( this.getPlayerOpen() > 0 ); } @TileEvent( TileEventType.NETWORK_READ ) public boolean readFromStream_TileSkyChest( final ByteBuf data ) { - final int wasOpen = this.playerOpen; - this.playerOpen = data.readBoolean() ? 1 : 0; + final int wasOpen = this.getPlayerOpen(); + this.setPlayerOpen( data.readBoolean() ? 1 : 0 ); - if( wasOpen != this.playerOpen ) + if( wasOpen != this.getPlayerOpen() ) { - this.lastEvent = System.currentTimeMillis(); + this.setLastEvent( System.currentTimeMillis() ); } return false; // TESR yo! @@ -84,9 +84,9 @@ public class TileSkyChest extends AEBaseInvTile return; } - this.playerOpen++; + this.setPlayerOpen( this.getPlayerOpen() + 1 ); - if( this.playerOpen == 1 ) + if( this.getPlayerOpen() == 1 ) { this.getWorldObj().playSoundEffect( this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, "random.chestopen", 0.5F, this.getWorldObj().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); @@ -101,14 +101,14 @@ public class TileSkyChest extends AEBaseInvTile return; } - this.playerOpen--; + this.setPlayerOpen( this.getPlayerOpen() - 1 ); - if( this.playerOpen < 0 ) + if( this.getPlayerOpen() < 0 ) { - this.playerOpen = 0; + this.setPlayerOpen( 0 ); } - if( this.playerOpen == 0 ) + if( this.getPlayerOpen() == 0 ) { this.getWorldObj().playSoundEffect( this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, "random.chestclosed", 0.5F, this.getWorldObj().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); @@ -126,4 +126,34 @@ public class TileSkyChest extends AEBaseInvTile { return this.sides; } + + public float getLidAngle() + { + return this.lidAngle; + } + + public void setLidAngle( final float lidAngle ) + { + this.lidAngle = lidAngle; + } + + public int getPlayerOpen() + { + return this.playerOpen; + } + + private void setPlayerOpen( final int playerOpen ) + { + this.playerOpen = playerOpen; + } + + public long getLastEvent() + { + return this.lastEvent; + } + + private void setLastEvent( final long lastEvent ) + { + this.lastEvent = lastEvent; + } } diff --git a/src/main/java/appeng/util/BlockUpdate.java b/src/main/java/appeng/util/BlockUpdate.java index a9f3190d..16fa9851 100644 --- a/src/main/java/appeng/util/BlockUpdate.java +++ b/src/main/java/appeng/util/BlockUpdate.java @@ -25,9 +25,9 @@ import net.minecraft.world.World; public class BlockUpdate implements IWorldCallable { - final int x; - final int y; - final int z; + private final int x; + private final int y; + private final int z; public BlockUpdate( final int x, final int y, final int z ) { diff --git a/src/main/java/appeng/util/InWorldToolOperationResult.java b/src/main/java/appeng/util/InWorldToolOperationResult.java index ff1f1b6f..6f7848b8 100644 --- a/src/main/java/appeng/util/InWorldToolOperationResult.java +++ b/src/main/java/appeng/util/InWorldToolOperationResult.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; public class InWorldToolOperationResult { - public final ItemStack BlockItem; - public final List Drops; + private final ItemStack BlockItem; + private final List Drops; public InWorldToolOperationResult() { @@ -74,4 +74,14 @@ public class InWorldToolOperationResult return new InWorldToolOperationResult( b, temp ); } + + public ItemStack getBlockItem() + { + return this.BlockItem; + } + + public List getDrops() + { + return this.Drops; + } } diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index 6f0ad451..1de1a82d 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -32,14 +32,15 @@ import appeng.util.item.AEItemStack; public class ItemSorters { - public static SortDir Direction = SortDir.ASCENDING; + private static SortDir Direction = SortDir.ASCENDING; + public static final Comparator CONFIG_BASED_SORT_BY_NAME = new Comparator() { @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) { - if( Direction == SortDir.ASCENDING ) + if( getDirection() == SortDir.ASCENDING ) { return Platform.getItemDisplayName( o1 ).compareToIgnoreCase( Platform.getItemDisplayName( o2 ) ); } @@ -55,7 +56,7 @@ public class ItemSorters final AEItemStack op1 = (AEItemStack) o1; final AEItemStack op2 = (AEItemStack) o2; - if( Direction == SortDir.ASCENDING ) + if( getDirection() == SortDir.ASCENDING ) { return this.secondarySort( op2.getModID().compareToIgnoreCase( op1.getModID() ), o1, o2 ); } @@ -78,7 +79,7 @@ public class ItemSorters @Override public int compare( final IAEItemStack o1, final IAEItemStack o2 ) { - if( Direction == SortDir.ASCENDING ) + if( getDirection() == SortDir.ASCENDING ) { return compareLong( o2.getStackSize(), o1.getStackSize() ); } @@ -99,7 +100,7 @@ public class ItemSorters final int cmp = api.compareItems( o1.getItemStack(), o2.getItemStack() ); - if( Direction == SortDir.ASCENDING ) + if( getDirection() == SortDir.ASCENDING ) { return cmp; } @@ -162,4 +163,14 @@ public class ItemSorters } return 1; } + + private static SortDir getDirection() + { + return Direction; + } + + public static void setDirection( final SortDir direction ) + { + Direction = direction; + } } diff --git a/src/main/java/appeng/util/LookDirection.java b/src/main/java/appeng/util/LookDirection.java index 525a8a11..a05cce61 100644 --- a/src/main/java/appeng/util/LookDirection.java +++ b/src/main/java/appeng/util/LookDirection.java @@ -25,12 +25,22 @@ import net.minecraft.util.Vec3; public class LookDirection { - public final Vec3 a; - public final Vec3 b; + private final Vec3 a; + private final Vec3 b; public LookDirection( final Vec3 a, final Vec3 b ) { this.a = a; this.b = b; } + + public Vec3 getA() + { + return this.a; + } + + public Vec3 getB() + { + return this.b; + } } diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 7e124cc3..e8dd6614 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -272,7 +272,7 @@ public class Platform /* * Simple way to cycle an enum... */ - public static T prevEnum( final T ce ) + private static T prevEnum( final T ce ) { final EnumSet valList = EnumSet.allOf( ce.getClass() ); @@ -417,7 +417,7 @@ public class Platform * Lots of silliness to try and account for weird tag related junk, basically requires that two tags have at least * something in their tags before it wasts its time comparing them. */ - public static boolean sameStackStags( final ItemStack a, final ItemStack b ) + private static boolean sameStackStags( final ItemStack a, final ItemStack b ) { if( a == null && b == null ) { @@ -1668,21 +1668,21 @@ public class Platform public static boolean securityCheck( final GridNode a, final GridNode b ) { - if( a.lastSecurityKey == -1 && b.lastSecurityKey == -1 ) + if( a.getLastSecurityKey() == -1 && b.getLastSecurityKey() == -1 ) { return false; } - else if( a.lastSecurityKey == b.lastSecurityKey ) + else if( a.getLastSecurityKey() == b.getLastSecurityKey() ) { return false; } - final boolean a_isSecure = isPowered( a.getGrid() ) && a.lastSecurityKey != -1; - final boolean b_isSecure = isPowered( b.getGrid() ) && b.lastSecurityKey != -1; + final boolean a_isSecure = isPowered( a.getGrid() ) && a.getLastSecurityKey() != -1; + final boolean b_isSecure = isPowered( b.getGrid() ) && b.getLastSecurityKey() != -1; if( AEConfig.instance.isFeatureEnabled( AEFeature.LogSecurityAudits ) ) { - AELog.info( "Audit: " + a_isSecure + " : " + b_isSecure + " @ " + a.lastSecurityKey + " vs " + b.lastSecurityKey + " & " + a.playerID + " vs " + b.playerID ); + AELog.info( "Audit: " + a_isSecure + " : " + b_isSecure + " @ " + a.getLastSecurityKey() + " vs " + b.getLastSecurityKey() + " & " + a.getPlayerID() + " vs " + b.getPlayerID() ); } // can't do that son... @@ -1693,12 +1693,12 @@ public class Platform if( !a_isSecure && b_isSecure ) { - return checkPlayerPermissions( b.getGrid(), a.playerID ); + return checkPlayerPermissions( b.getGrid(), a.getPlayerID() ); } if( a_isSecure && !b_isSecure ) { - return checkPlayerPermissions( a.getGrid(), b.playerID ); + return checkPlayerPermissions( a.getGrid(), b.getPlayerID() ); } return false; diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index 2c6a17fa..97aeaf41 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -317,7 +317,7 @@ public class AdaptorIInventory extends InventoryAdaptor return left; } - boolean canRemoveStackFromSlot( final int x, final ItemStack is ) + private boolean canRemoveStackFromSlot( final int x, final ItemStack is ) { if( this.wrapperEnabled ) { @@ -332,11 +332,11 @@ public class AdaptorIInventory extends InventoryAdaptor return new InvIterator(); } - class InvIterator implements Iterator + private class InvIterator implements Iterator { - final ItemSlot is = new ItemSlot(); - int x = 0; + private final ItemSlot is = new ItemSlot(); + private int x = 0; @Override public boolean hasNext() @@ -349,10 +349,10 @@ public class AdaptorIInventory extends InventoryAdaptor { final ItemStack iss = AdaptorIInventory.this.i.getStackInSlot( this.x ); - this.is.isExtractable = AdaptorIInventory.this.canRemoveStackFromSlot( this.x, iss ); + this.is.setExtractable( AdaptorIInventory.this.canRemoveStackFromSlot( this.x, iss ) ); this.is.setItemStack( iss ); - this.is.slot = this.x; + this.is.setSlot( this.x ); this.x++; return this.is; } diff --git a/src/main/java/appeng/util/inv/IMEAdaptor.java b/src/main/java/appeng/util/inv/IMEAdaptor.java index ba184646..1a99aa3d 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptor.java +++ b/src/main/java/appeng/util/inv/IMEAdaptor.java @@ -39,9 +39,9 @@ import appeng.util.item.AEItemStack; public class IMEAdaptor extends InventoryAdaptor { - final IMEInventory target; - final BaseActionSource src; - int maxSlots = 0; + private final IMEInventory target; + private final BaseActionSource src; + private int maxSlots = 0; public IMEAdaptor( final IMEInventory input, final BaseActionSource src ) { @@ -55,7 +55,7 @@ public class IMEAdaptor extends InventoryAdaptor return new IMEAdaptorIterator( this, this.getList() ); } - IItemList getList() + private IItemList getList() { return this.target.getAvailableItems( AEApi.instance().storage().createItemList() ); } @@ -66,7 +66,7 @@ public class IMEAdaptor extends InventoryAdaptor return this.doRemoveItems( amount, filter, destination, Actionable.MODULATE ); } - public ItemStack doRemoveItems( final int amount, final ItemStack filter, final IInventoryDestination destination, final Actionable type ) + private ItemStack doRemoveItems( final int amount, final ItemStack filter, final IInventoryDestination destination, final Actionable type ) { IAEItemStack req = null; @@ -115,7 +115,7 @@ public class IMEAdaptor extends InventoryAdaptor return this.doRemoveItemsFuzzy( amount, filter, destination, Actionable.MODULATE, fuzzyMode ); } - public ItemStack doRemoveItemsFuzzy( final int amount, final ItemStack filter, final IInventoryDestination destination, final Actionable type, final FuzzyMode fuzzyMode ) + private ItemStack doRemoveItemsFuzzy( final int amount, final ItemStack filter, final IInventoryDestination destination, final Actionable type, final FuzzyMode fuzzyMode ) { final IAEItemStack reqFilter = AEItemStack.create( filter ); if( reqFilter == null ) @@ -186,4 +186,14 @@ public class IMEAdaptor extends InventoryAdaptor { return !this.getList().isEmpty(); } + + int getMaxSlots() + { + return this.maxSlots; + } + + void setMaxSlots( final int maxSlots ) + { + this.maxSlots = maxSlots; + } } diff --git a/src/main/java/appeng/util/inv/IMEAdaptorIterator.java b/src/main/java/appeng/util/inv/IMEAdaptorIterator.java index abff1337..cf064a32 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptorIterator.java +++ b/src/main/java/appeng/util/inv/IMEAdaptorIterator.java @@ -38,7 +38,7 @@ public final class IMEAdaptorIterator implements Iterator public IMEAdaptorIterator( final IMEAdaptor parent, final IItemList availableItems ) { this.stack = availableItems.iterator(); - this.containerSize = parent.maxSlots; + this.containerSize = parent.getMaxSlots(); this.parent = parent; } @@ -52,13 +52,13 @@ public final class IMEAdaptorIterator implements Iterator @Override public ItemSlot next() { - this.slot.slot = this.offset; + this.slot.setSlot( this.offset ); this.offset++; - this.slot.isExtractable = true; + this.slot.setExtractable( true ); - if( this.parent.maxSlots < this.offset ) + if( this.parent.getMaxSlots() < this.offset ) { - this.parent.maxSlots = this.offset; + this.parent.setMaxSlots( this.offset ); } if( this.hasNext ) diff --git a/src/main/java/appeng/util/inv/IMEInventoryDestination.java b/src/main/java/appeng/util/inv/IMEInventoryDestination.java index 89bd0f5e..af366349 100644 --- a/src/main/java/appeng/util/inv/IMEInventoryDestination.java +++ b/src/main/java/appeng/util/inv/IMEInventoryDestination.java @@ -30,7 +30,7 @@ import appeng.util.item.AEItemStack; public class IMEInventoryDestination implements IInventoryDestination { - final IMEInventory me; + private final IMEInventory me; public IMEInventoryDestination( final IMEInventory o ) { diff --git a/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java b/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java index d361da08..429917c0 100644 --- a/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java +++ b/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java @@ -30,7 +30,7 @@ import appeng.api.storage.data.IItemList; public class ItemListIgnoreCrafting implements IItemList { - final IItemList target; + private final IItemList target; public ItemListIgnoreCrafting( final IItemList cla ) { diff --git a/src/main/java/appeng/util/inv/ItemSlot.java b/src/main/java/appeng/util/inv/ItemSlot.java index 9f6b5d85..04883968 100644 --- a/src/main/java/appeng/util/inv/ItemSlot.java +++ b/src/main/java/appeng/util/inv/ItemSlot.java @@ -28,8 +28,8 @@ import appeng.util.item.AEItemStack; public class ItemSlot { - public int slot; - public boolean isExtractable; + private int slot; + private boolean isExtractable; // one or the other.. private IAEItemStack aeItemStack; private ItemStack itemStack; @@ -50,9 +50,29 @@ public class ItemSlot return this.aeItemStack == null ? ( this.itemStack == null ? null : ( this.aeItemStack = AEItemStack.create( this.itemStack ) ) ) : this.aeItemStack; } - public void setAEItemStack( final IAEItemStack is ) + void setAEItemStack( final IAEItemStack is ) { this.aeItemStack = is; this.itemStack = null; } + + public boolean isExtractable() + { + return this.isExtractable; + } + + void setExtractable( final boolean isExtractable ) + { + this.isExtractable = isExtractable; + } + + public int getSlot() + { + return this.slot; + } + + public void setSlot( final int slot ) + { + this.slot = slot; + } } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index ab904384..8fb06c96 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -34,7 +34,7 @@ import net.minecraft.item.ItemStack; public class WrapperChainedInventory implements IInventory { - int fullSize = 0; + private int fullSize = 0; private List l; private Map offsets; @@ -43,13 +43,13 @@ public class WrapperChainedInventory implements IInventory this.setInventory( inventories ); } - public void setInventory( final IInventory... a ) + private void setInventory( final IInventory... a ) { this.l = ImmutableList.copyOf( a ); this.calculateSizes(); } - public void calculateSizes() + private void calculateSizes() { this.offsets = new HashMap(); @@ -77,7 +77,7 @@ public class WrapperChainedInventory implements IInventory this.setInventory( inventories ); } - public void setInventory( final List a ) + private void setInventory( final List a ) { this.l = a; this.calculateSizes(); @@ -227,11 +227,11 @@ public class WrapperChainedInventory implements IInventory return false; } - static class InvOffset + private static class InvOffset { - int offset; - int size; - IInventory i; + private int offset; + private int size; + private IInventory i; } } diff --git a/src/main/java/appeng/util/inv/WrapperInvSlot.java b/src/main/java/appeng/util/inv/WrapperInvSlot.java index 03491db8..14c3f21b 100644 --- a/src/main/java/appeng/util/inv/WrapperInvSlot.java +++ b/src/main/java/appeng/util/inv/WrapperInvSlot.java @@ -44,7 +44,7 @@ public class WrapperInvSlot return true; } - class InternalInterfaceWrapper implements IInventory + private class InternalInterfaceWrapper implements IInventory { private final IInventory inv; diff --git a/src/main/java/appeng/util/inv/WrapperInventoryRange.java b/src/main/java/appeng/util/inv/WrapperInventoryRange.java index f7da9a78..987463da 100644 --- a/src/main/java/appeng/util/inv/WrapperInventoryRange.java +++ b/src/main/java/appeng/util/inv/WrapperInventoryRange.java @@ -28,31 +28,31 @@ public class WrapperInventoryRange implements IInventory { private final IInventory src; - protected boolean ignoreValidItems = false; - int[] slots; + private boolean ignoreValidItems = false; + private int[] slots; public WrapperInventoryRange( final IInventory a, final int[] s, final boolean ignoreValid ) { this.src = a; - this.slots = s; + this.setSlots( s ); - if( this.slots == null ) + if( this.getSlots() == null ) { - this.slots = new int[0]; + this.setSlots( new int[0] ); } - this.ignoreValidItems = ignoreValid; + this.setIgnoreValidItems( ignoreValid ); } public WrapperInventoryRange( final IInventory a, final int min, final int size, final boolean ignoreValid ) { this.src = a; - this.slots = new int[size]; + this.setSlots( new int[size] ); for( int x = 0; x < size; x++ ) { - this.slots[x] = min + x; + this.getSlots()[x] = min + x; } - this.ignoreValidItems = ignoreValid; + this.setIgnoreValidItems( ignoreValid ); } public static String concatLines( final int[] s, final String separator ) @@ -76,31 +76,31 @@ public class WrapperInventoryRange implements IInventory @Override public int getSizeInventory() { - return this.slots.length; + return this.getSlots().length; } @Override public ItemStack getStackInSlot( final int var1 ) { - return this.src.getStackInSlot( this.slots[var1] ); + return this.src.getStackInSlot( this.getSlots()[var1] ); } @Override public ItemStack decrStackSize( final int var1, final int var2 ) { - return this.src.decrStackSize( this.slots[var1], var2 ); + return this.src.decrStackSize( this.getSlots()[var1], var2 ); } @Override public ItemStack getStackInSlotOnClosing( final int var1 ) { - return this.src.getStackInSlotOnClosing( this.slots[var1] ); + return this.src.getStackInSlotOnClosing( this.getSlots()[var1] ); } @Override public void setInventorySlotContents( final int var1, final ItemStack var2 ) { - this.src.setInventorySlotContents( this.slots[var1], var2 ); + this.src.setInventorySlotContents( this.getSlots()[var1], var2 ); } @Override @@ -148,11 +148,31 @@ public class WrapperInventoryRange implements IInventory @Override public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { - if( this.ignoreValidItems ) + if( this.isIgnoreValidItems() ) { return true; } - return this.src.isItemValidForSlot( this.slots[i], itemstack ); + return this.src.isItemValidForSlot( this.getSlots()[i], itemstack ); + } + + boolean isIgnoreValidItems() + { + return this.ignoreValidItems; + } + + private void setIgnoreValidItems( final boolean ignoreValidItems ) + { + this.ignoreValidItems = ignoreValidItems; + } + + int[] getSlots() + { + return this.slots; + } + + private void setSlots( final int[] slots ) + { + this.slots = slots; } } diff --git a/src/main/java/appeng/util/inv/WrapperMCISidedInventory.java b/src/main/java/appeng/util/inv/WrapperMCISidedInventory.java index bfe66df0..78b58a9a 100644 --- a/src/main/java/appeng/util/inv/WrapperMCISidedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperMCISidedInventory.java @@ -27,7 +27,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class WrapperMCISidedInventory extends WrapperInventoryRange implements IInventoryWrapper { - final ISidedInventory side; + private final ISidedInventory side; private final ForgeDirection dir; public WrapperMCISidedInventory( final ISidedInventory a, final ForgeDirection d ) @@ -51,14 +51,14 @@ public class WrapperMCISidedInventory extends WrapperInventoryRange implements I public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) { - if( this.ignoreValidItems ) + if( this.isIgnoreValidItems() ) { return true; } - if( this.side.isItemValidForSlot( this.slots[i], itemstack ) ) + if( this.side.isItemValidForSlot( this.getSlots()[i], itemstack ) ) { - return this.side.canInsertItem( this.slots[i], itemstack, this.dir.ordinal() ); + return this.side.canInsertItem( this.getSlots()[i], itemstack, this.dir.ordinal() ); } return false; @@ -72,6 +72,6 @@ public class WrapperMCISidedInventory extends WrapperInventoryRange implements I return false; } - return this.side.canExtractItem( this.slots[i], is, this.dir.ordinal() ); + return this.side.canExtractItem( this.getSlots()[i], is, this.dir.ordinal() ); } } diff --git a/src/main/java/appeng/util/inv/WrapperTEPipe.java b/src/main/java/appeng/util/inv/WrapperTEPipe.java deleted file mode 100644 index ee52bf5f..00000000 --- a/src/main/java/appeng/util/inv/WrapperTEPipe.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.util.inv; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - - -public class WrapperTEPipe implements IInventory -{ - - final TileEntity ad; - final ForgeDirection dir; - - public WrapperTEPipe( final TileEntity te, final ForgeDirection d ) - { - this.ad = te; - this.dir = d; - } - - @Override - public int getSizeInventory() - { - return 1; - } - - @Override - public ItemStack getStackInSlot( final int i ) - { - return null; - } - - @Override - public ItemStack decrStackSize( final int i, final int j ) - { - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing( final int i ) - { - return null; - } - - @Override - public void setInventorySlotContents( final int i, final ItemStack itemstack ) - { - // ITE.addItemsToPipe( ad, itemstack, dir ); - } - - @Override - public String getInventoryName() - { - return null; - } - - @Override - public boolean hasCustomInventoryName() - { - return false; - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public void markDirty() - { - - } - - @Override - public boolean isUseableByPlayer( final EntityPlayer entityplayer ) - { - return false; - } - - @Override - public void openInventory() - { - - } - - @Override - public void closeInventory() - { - - } - - @Override - public boolean isItemValidForSlot( final int i, final ItemStack itemstack ) - { - return false; - } -} diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index f323b67e..7e5dd06d 100644 --- a/src/main/java/appeng/util/item/AEFluidStack.java +++ b/src/main/java/appeng/util/item/AEFluidStack.java @@ -55,7 +55,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu { this.fluid = is.fluid; - this.stackSize = is.stackSize; + this.setStackSize( is.getStackSize() ); // priority = is.priority; this.setCraftable( is.isCraftable() ); @@ -73,7 +73,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu throw new IllegalArgumentException( "Fluid is null." ); } - this.stackSize = is.amount; + this.setStackSize( is.amount ); this.setCraftable( false ); this.setCountRequestable( 0 ); @@ -89,7 +89,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu } final AEFluidStack fluid = AEFluidStack.create( itemstack ); // fluid.priority = i.getInteger( "Priority" ); - fluid.stackSize = i.getLong( "Cnt" ); + fluid.setStackSize( i.getLong( "Cnt" ) ); fluid.setCountRequestable( i.getLong( "Req" ) ); fluid.setCraftable( i.getBoolean( "Craft" ) ); return fluid; @@ -154,7 +154,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu final AEFluidStack fluid = AEFluidStack.create( fluidStack ); // fluid.priority = (int) priority; - fluid.stackSize = stackSize; + fluid.setStackSize( stackSize ); fluid.setCountRequestable( countRequestable ); fluid.setCraftable( isCraftable ); return fluid; @@ -202,7 +202,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu /* * if ( Cnt != null && Cnt instanceof NBTTagLong ) ((NBTTagLong) Cnt).data = this.stackSize; else */ - i.setLong( "Cnt", this.stackSize ); + i.setLong( "Cnt", this.getStackSize() ); /* * if ( Req != null && Req instanceof NBTTagLong ) ((NBTTagLong) Req).data = this.stackSize; else @@ -374,7 +374,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu @Override public FluidStack getFluidStack() { - final FluidStack is = new FluidStack( this.fluid, (int) Math.min( Integer.MAX_VALUE, this.stackSize ) ); + final FluidStack is = new FluidStack( this.fluid, (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) ); if( this.tagCompound != null ) { is.tag = this.tagCompound.getNBTTagCompoundCopy(); diff --git a/src/main/java/appeng/util/item/AEItemDef.java b/src/main/java/appeng/util/item/AEItemDef.java index 2f77f8be..8937d1b7 100644 --- a/src/main/java/appeng/util/item/AEItemDef.java +++ b/src/main/java/appeng/util/item/AEItemDef.java @@ -37,21 +37,22 @@ public class AEItemDef static final AESharedNBT LOW_TAG = new AESharedNBT( Integer.MIN_VALUE ); static final AESharedNBT HIGH_TAG = new AESharedNBT( Integer.MAX_VALUE ); - public final int itemID; - public final Item item; - public int myHash; - public int def; - public int damageValue; - public int displayDamage; - public int maxDamage; - public AESharedNBT tagCompound; + + private final int itemID; + private final Item item; + private int myHash; + private int def; + private int damageValue; + private int displayDamage; + private int maxDamage; + private AESharedNBT tagCompound; @SideOnly( Side.CLIENT ) - public String displayName; + private String displayName; @SideOnly( Side.CLIENT ) - public List tooltip; + private List tooltip; @SideOnly( Side.CLIENT ) - public UniqueIdentifier uniqueID; - public OreReference isOre; + private UniqueIdentifier uniqueID; + private OreReference isOre; public AEItemDef( final Item it ) { @@ -59,15 +60,15 @@ public class AEItemDef this.itemID = Item.getIdFromItem( it ); } - public AEItemDef copy() + AEItemDef copy() { - final AEItemDef t = new AEItemDef( this.item ); + final AEItemDef t = new AEItemDef( this.getItem() ); t.def = this.def; - t.damageValue = this.damageValue; - t.displayDamage = this.displayDamage; - t.maxDamage = this.maxDamage; - t.tagCompound = this.tagCompound; - t.isOre = this.isOre; + t.setDamageValue( this.getDamageValue() ); + t.setDisplayDamage( this.getDisplayDamage() ); + t.setMaxDamage( this.getMaxDamage() ); + t.setTagCompound( this.getTagCompound() ); + t.setIsOre( this.getIsOre() ); return t; } @@ -83,24 +84,24 @@ public class AEItemDef return false; } final AEItemDef other = (AEItemDef) obj; - return other.damageValue == this.damageValue && other.item == this.item && this.tagCompound == other.tagCompound; + return other.getDamageValue() == this.getDamageValue() && other.getItem() == this.getItem() && this.getTagCompound() == other.getTagCompound(); } - public boolean isItem( final ItemStack otherStack ) + boolean isItem( final ItemStack otherStack ) { // hackery! final int dmg = this.getDamageValueHack( otherStack ); - if( this.item == otherStack.getItem() && dmg == this.damageValue ) + if( this.getItem() == otherStack.getItem() && dmg == this.getDamageValue() ) { - if( ( this.tagCompound != null ) == otherStack.hasTagCompound() ) + if( ( this.getTagCompound() != null ) == otherStack.hasTagCompound() ) { return true; } - if( this.tagCompound != null && otherStack.hasTagCompound() ) + if( this.getTagCompound() != null && otherStack.hasTagCompound() ) { - return Platform.NBTEqualityTest( this.tagCompound, otherStack.getTagCompound() ); + return Platform.NBTEqualityTest( this.getTagCompound(), otherStack.getTagCompound() ); } return true; @@ -108,14 +109,116 @@ public class AEItemDef return false; } - public int getDamageValueHack( final ItemStack is ) + int getDamageValueHack( final ItemStack is ) { return Items.blaze_rod.getDamage( is ); } - public void reHash() + void reHash() { - this.def = this.itemID << Platform.DEF_OFFSET | this.damageValue; - this.myHash = this.def ^ ( this.tagCompound == null ? 0 : System.identityHashCode( this.tagCompound ) ); + this.def = this.getItemID() << Platform.DEF_OFFSET | this.getDamageValue(); + this.myHash = this.def ^ ( this.getTagCompound() == null ? 0 : System.identityHashCode( this.getTagCompound() ) ); } + + AESharedNBT getTagCompound() + { + return this.tagCompound; + } + + void setTagCompound( final AESharedNBT tagCompound ) + { + this.tagCompound = tagCompound; + } + + int getDamageValue() + { + return this.damageValue; + } + + int setDamageValue( final int damageValue ) + { + this.damageValue = damageValue; + return damageValue; + } + + Item getItem() + { + return this.item; + } + + int getDisplayDamage() + { + return this.displayDamage; + } + + void setDisplayDamage( final int displayDamage ) + { + this.displayDamage = displayDamage; + } + + String getDisplayName() + { + return this.displayName; + } + + void setDisplayName( final String displayName ) + { + this.displayName = displayName; + } + + List getTooltip() + { + return this.tooltip; + } + + List setTooltip( final List tooltip ) + { + this.tooltip = tooltip; + return tooltip; + } + + UniqueIdentifier getUniqueID() + { + return this.uniqueID; + } + + UniqueIdentifier setUniqueID( final UniqueIdentifier uniqueID ) + { + this.uniqueID = uniqueID; + return uniqueID; + } + + OreReference getIsOre() + { + return this.isOre; + } + + void setIsOre( final OreReference isOre ) + { + this.isOre = isOre; + } + + int getItemID() + { + return this.itemID; + } + + int getMaxDamage() + { + return this.maxDamage; + } + + void setMaxDamage( final int maxDamage ) + { + this.maxDamage = maxDamage; + } + + /** + * TODO: Check if replaceable by hashCode(); + */ + int getMyHash() + { + return this.myHash; + } + } diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 5ef81532..5714bf1b 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -51,12 +51,12 @@ import appeng.util.Platform; public final class AEItemStack extends AEStack implements IAEItemStack, Comparable { - AEItemDef def; + private AEItemDef def; private AEItemStack( final AEItemStack is ) { - this.def = is.def; - this.stackSize = is.stackSize; + this.setDefinition( is.getDefinition() ); + this.setStackSize( is.getStackSize() ); this.setCraftable( is.isCraftable() ); this.setCountRequestable( is.getCountRequestable() ); } @@ -74,9 +74,9 @@ public final class AEItemStack extends AEStack implements IAEItemS throw new InvalidParameterException( "Contained item is null, thus not a valid ItemStack for AEItemStack." ); } - this.def = new AEItemDef( item ); + this.setDefinition( new AEItemDef( item ) ); - if( this.def.item == null ) + if( this.getDefinition().getItem() == null ) { throw new InvalidParameterException( "This ItemStack is bad, it has a null item." ); } @@ -93,22 +93,22 @@ public final class AEItemStack extends AEStack implements IAEItemS /* * Kinda hackery */ - this.def.damageValue = this.def.getDamageValueHack( is ); - this.def.displayDamage = is.getItemDamageForDisplay(); - this.def.maxDamage = is.getMaxDamage(); + this.getDefinition().setDamageValue( this.getDefinition().getDamageValueHack( is ) ); + this.getDefinition().setDisplayDamage( is.getItemDamageForDisplay() ); + this.getDefinition().setMaxDamage( is.getMaxDamage() ); final NBTTagCompound tagCompound = is.getTagCompound(); if( tagCompound != null ) { - this.def.tagCompound = (AESharedNBT) AESharedNBT.getSharedTagCompound( tagCompound, is ); + this.getDefinition().setTagCompound( (AESharedNBT) AESharedNBT.getSharedTagCompound( tagCompound, is ) ); } - this.stackSize = is.stackSize; + this.setStackSize( is.stackSize ); this.setCraftable( false ); this.setCountRequestable( 0 ); - this.def.reHash(); - this.def.isOre = OreHelper.INSTANCE.isOre( is ); + this.getDefinition().reHash(); + this.getDefinition().setIsOre( OreHelper.INSTANCE.isOre( is ) ); } public static IAEItemStack loadItemStackFromNBT( final NBTTagCompound i ) @@ -126,7 +126,7 @@ public final class AEItemStack extends AEStack implements IAEItemS final AEItemStack item = AEItemStack.create( itemstack ); // item.priority = i.getInteger( "Priority" ); - item.stackSize = i.getLong( "Cnt" ); + item.setStackSize( i.getLong( "Cnt" ) ); item.setCountRequestable( i.getLong( "Req" ) ); item.setCraftable( i.getBoolean( "Craft" ) ); return item; @@ -182,7 +182,7 @@ public final class AEItemStack extends AEStack implements IAEItemS final AEItemStack item = AEItemStack.create( itemstack ); // item.priority = (int) priority; - item.stackSize = stackSize; + item.setStackSize( stackSize ); item.setCountRequestable( countRequestable ); item.setCraftable( isCraftable ); return item; @@ -219,7 +219,7 @@ public final class AEItemStack extends AEStack implements IAEItemS /* * if ( id != null && id instanceof NBTTagShort ) ((NBTTagShort) id).data = (short) this.def.item.itemID; else */ - i.setShort( "id", (short) Item.itemRegistry.getIDForObject( this.def.item ) ); + i.setShort( "id", (short) Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) ); /* * if ( Count != null && Count instanceof NBTTagByte ) ((NBTTagByte) Count).data = (byte) 0; else @@ -229,7 +229,7 @@ public final class AEItemStack extends AEStack implements IAEItemS /* * if ( Cnt != null && Cnt instanceof NBTTagLong ) ((NBTTagLong) Cnt).data = this.stackSize; else */ - i.setLong( "Cnt", this.stackSize ); + i.setLong( "Cnt", this.getStackSize() ); /* * if ( Req != null && Req instanceof NBTTagLong ) ((NBTTagLong) Req).data = this.stackSize; else @@ -246,11 +246,11 @@ public final class AEItemStack extends AEStack implements IAEItemS * if ( Damage != null && Damage instanceof NBTTagShort ) ((NBTTagShort) Damage).data = (short) * this.def.damageValue; else */ - i.setShort( "Damage", (short) this.def.damageValue ); + i.setShort( "Damage", (short) this.getDefinition().getDamageValue() ); - if( this.def.tagCompound != null ) + if( this.getDefinition().getTagCompound() != null ) { - i.setTag( "tag", this.def.tagCompound ); + i.setTag( "tag", this.getDefinition().getTagCompound() ); } else { @@ -272,7 +272,7 @@ public final class AEItemStack extends AEStack implements IAEItemS if( o.getItem() == this.getItem() ) { - if( this.def.item.isDamageable() ) + if( this.getDefinition().getItem().isDamageable() ) { final ItemStack a = this.getItemStack(); final ItemStack b = o.getItemStack(); @@ -327,7 +327,7 @@ public final class AEItemStack extends AEStack implements IAEItemS if( o.getItem() == this.getItem() ) { - if( this.def.item.isDamageable() ) + if( this.getDefinition().getItem().isDamageable() ) { final ItemStack a = this.getItemStack(); @@ -393,7 +393,7 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public IAETagCompound getTagCompound() { - return this.def.tagCompound; + return this.getDefinition().getTagCompound(); } @Override @@ -417,10 +417,10 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public ItemStack getItemStack() { - final ItemStack is = new ItemStack( this.def.item, (int) Math.min( Integer.MAX_VALUE, this.stackSize ), this.def.damageValue ); - if( this.def.tagCompound != null ) + final ItemStack is = new ItemStack( this.getDefinition().getItem(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ), this.getDefinition().getDamageValue() ); + if( this.getDefinition().getTagCompound() != null ) { - is.setTagCompound( this.def.tagCompound.getNBTTagCompoundCopy() ); + is.setTagCompound( this.getDefinition().getTagCompound().getNBTTagCompoundCopy() ); } return is; @@ -429,13 +429,13 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public Item getItem() { - return this.def.item; + return this.getDefinition().getItem(); } @Override public int getItemDamage() { - return this.def.damageValue; + return this.getDefinition().getDamageValue(); } @Override @@ -452,7 +452,7 @@ public final class AEItemStack extends AEStack implements IAEItemS return false; } - return this.def.equals( ( (AEItemStack) otherStack ).def ); + return this.getDefinition().equals( ( (AEItemStack) otherStack ).getDefinition() ); } @Override @@ -463,13 +463,13 @@ public final class AEItemStack extends AEStack implements IAEItemS return false; } - return this.def.isItem( otherStack ); + return this.getDefinition().isItem( otherStack ); } @Override public int hashCode() { - return this.def.myHash; + return this.getDefinition().getMyHash(); } @Override @@ -477,16 +477,17 @@ public final class AEItemStack extends AEStack implements IAEItemS { if( ia instanceof AEItemStack ) { - return ( (AEItemStack) ia ).def.equals( this.def );// && def.tagCompound == ((AEItemStack) - // ia).def.tagCompound; + return ( (AEItemStack) ia ).getDefinition().equals( this.getDefinition() );// && def.tagCompound == + // ((AEItemStack) + // ia).def.tagCompound; } else if( ia instanceof ItemStack ) { final ItemStack is = (ItemStack) ia; - if( is.getItem() == this.def.item && is.getItemDamage() == this.def.damageValue ) + if( is.getItem() == this.getDefinition().getItem() && is.getItemDamage() == this.getDefinition().getDamageValue() ) { - final NBTTagCompound ta = this.def.tagCompound; + final NBTTagCompound ta = this.getDefinition().getTagCompound(); final NBTTagCompound tb = is.getTagCompound(); if( ta == tb ) { @@ -523,33 +524,33 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public int compareTo( final AEItemStack b ) { - final int id = this.def.itemID - b.def.itemID; + final int id = this.getDefinition().getItemID() - b.getDefinition().getItemID(); if( id != 0 ) { return id; } - final int damageValue = this.def.damageValue - b.def.damageValue; + final int damageValue = this.getDefinition().getDamageValue() - b.getDefinition().getDamageValue(); if( damageValue != 0 ) { return damageValue; } - final int displayDamage = this.def.displayDamage - b.def.displayDamage; + final int displayDamage = this.getDefinition().getDisplayDamage() - b.getDefinition().getDisplayDamage(); if( displayDamage != 0 ) { return displayDamage; } - return ( this.def.tagCompound == b.def.tagCompound ) ? 0 : this.compareNBT( b.def ); + return ( this.getDefinition().getTagCompound() == b.getDefinition().getTagCompound() ) ? 0 : this.compareNBT( b.getDefinition() ); } private int compareNBT( final AEItemDef b ) { - final int nbt = this.compare( ( this.def.tagCompound == null ? 0 : this.def.tagCompound.getHash() ), ( b.tagCompound == null ? 0 : b.tagCompound.getHash() ) ); + final int nbt = this.compare( ( this.getDefinition().getTagCompound() == null ? 0 : this.getDefinition().getTagCompound().getHash() ), ( b.getTagCompound() == null ? 0 : b.getTagCompound().getHash() ) ); if( nbt == 0 ) { - return this.compare( System.identityHashCode( this.def.tagCompound ), System.identityHashCode( b.tagCompound ) ); + return this.compare( System.identityHashCode( this.getDefinition().getTagCompound() ), System.identityHashCode( b.getTagCompound() ) ); } return nbt; } @@ -562,34 +563,34 @@ public final class AEItemStack extends AEStack implements IAEItemS @SideOnly( Side.CLIENT ) public List getToolTip() { - if( this.def.tooltip != null ) + if( this.getDefinition().getTooltip() != null ) { - return this.def.tooltip; + return this.getDefinition().getTooltip(); } - return this.def.tooltip = Platform.getTooltip( this.getItemStack() ); + return this.getDefinition().setTooltip( Platform.getTooltip( this.getItemStack() ) ); } @SideOnly( Side.CLIENT ) public String getDisplayName() { - if( this.def.displayName != null ) + if( this.getDefinition().getDisplayName() == null ) { - return this.def.displayName; + this.getDefinition().setDisplayName( Platform.getItemDisplayName( this.getItemStack() ) ); } - return this.def.displayName = Platform.getItemDisplayName( this.getItemStack() ); + return this.getDefinition().getDisplayName(); } @SideOnly( Side.CLIENT ) public String getModID() { - if( this.def.uniqueID != null ) + if( this.getDefinition().getUniqueID() != null ) { - return this.getModName( this.def.uniqueID ); + return this.getModName( this.getDefinition().getUniqueID() ); } - return this.getModName( this.def.uniqueID = GameRegistry.findUniqueIdentifierFor( this.def.item ) ); + return this.getModName( this.getDefinition().setUniqueID( GameRegistry.findUniqueIdentifierFor( this.getDefinition().getItem() ) ) ); } private String getModName( final UniqueIdentifier uniqueIdentifier ) @@ -602,101 +603,101 @@ public final class AEItemStack extends AEStack implements IAEItemS return uniqueIdentifier.modId == null ? "** Null" : uniqueIdentifier.modId; } - public IAEItemStack getLow( final FuzzyMode fuzzy, final boolean ignoreMeta ) + IAEItemStack getLow( final FuzzyMode fuzzy, final boolean ignoreMeta ) { final AEItemStack bottom = new AEItemStack( this ); - final AEItemDef newDef = bottom.def = bottom.def.copy(); + final AEItemDef newDef = bottom.setDefinition( bottom.getDefinition().copy() ); if( ignoreMeta ) { - newDef.displayDamage = newDef.damageValue = 0; + newDef.setDisplayDamage( newDef.setDamageValue( 0 ) ); newDef.reHash(); return bottom; } - if( newDef.item.isDamageable() ) + if( newDef.getItem().isDamageable() ) { if( fuzzy == FuzzyMode.IGNORE_ALL ) { - newDef.displayDamage = 0; + newDef.setDisplayDamage( 0 ); } else if( fuzzy == FuzzyMode.PERCENT_99 ) { - if( this.def.damageValue == 0 ) + if( this.getDefinition().getDamageValue() == 0 ) { - newDef.displayDamage = 0; + newDef.setDisplayDamage( 0 ); } else { - newDef.displayDamage = 1; + newDef.setDisplayDamage( 1 ); } } else { - final int breakpoint = fuzzy.calculateBreakPoint( this.def.maxDamage ); - newDef.displayDamage = breakpoint <= this.def.displayDamage ? breakpoint : 0; + final int breakpoint = fuzzy.calculateBreakPoint( this.getDefinition().getMaxDamage() ); + newDef.setDisplayDamage( breakpoint <= this.getDefinition().getDisplayDamage() ? breakpoint : 0 ); } - newDef.damageValue = newDef.displayDamage; + newDef.setDamageValue( newDef.getDisplayDamage() ); } - newDef.tagCompound = AEItemDef.LOW_TAG; + newDef.setTagCompound( AEItemDef.LOW_TAG ); newDef.reHash(); return bottom; } - public IAEItemStack getHigh( final FuzzyMode fuzzy, final boolean ignoreMeta ) + IAEItemStack getHigh( final FuzzyMode fuzzy, final boolean ignoreMeta ) { final AEItemStack top = new AEItemStack( this ); - final AEItemDef newDef = top.def = top.def.copy(); + final AEItemDef newDef = top.setDefinition( top.getDefinition().copy() ); if( ignoreMeta ) { - newDef.displayDamage = newDef.damageValue = Integer.MAX_VALUE; + newDef.setDisplayDamage( newDef.setDamageValue( Integer.MAX_VALUE ) ); newDef.reHash(); return top; } - if( newDef.item.isDamageable() ) + if( newDef.getItem().isDamageable() ) { if( fuzzy == FuzzyMode.IGNORE_ALL ) { - newDef.displayDamage = this.def.maxDamage + 1; + newDef.setDisplayDamage( this.getDefinition().getMaxDamage() + 1 ); } else if( fuzzy == FuzzyMode.PERCENT_99 ) { - if( this.def.damageValue == 0 ) + if( this.getDefinition().getDamageValue() == 0 ) { - newDef.displayDamage = 0; + newDef.setDisplayDamage( 0 ); } else { - newDef.displayDamage = this.def.maxDamage + 1; + newDef.setDisplayDamage( this.getDefinition().getMaxDamage() + 1 ); } } else { - final int breakpoint = fuzzy.calculateBreakPoint( this.def.maxDamage ); - newDef.displayDamage = this.def.displayDamage < breakpoint ? breakpoint - 1 : this.def.maxDamage + 1; + final int breakpoint = fuzzy.calculateBreakPoint( this.getDefinition().getMaxDamage() ); + newDef.setDisplayDamage( this.getDefinition().getDisplayDamage() < breakpoint ? breakpoint - 1 : this.getDefinition().getMaxDamage() + 1 ); } - newDef.damageValue = newDef.displayDamage; + newDef.setDamageValue( newDef.getDisplayDamage() ); } - newDef.tagCompound = AEItemDef.HIGH_TAG; + newDef.setTagCompound( AEItemDef.HIGH_TAG ); newDef.reHash(); return top; } public boolean isOre() { - return this.def.isOre != null; + return this.getDefinition().getIsOre() != null; } @Override void writeIdentity( final ByteBuf i ) throws IOException { - i.writeShort( Item.itemRegistry.getIDForObject( this.def.item ) ); + i.writeShort( Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) ); i.writeShort( this.getItemDamage() ); } @@ -721,6 +722,17 @@ public final class AEItemStack extends AEStack implements IAEItemS @Override public boolean hasTagCompound() { - return this.def.tagCompound != null; + return this.getDefinition().getTagCompound() != null; + } + + AEItemDef getDefinition() + { + return this.def; + } + + private AEItemDef setDefinition( final AEItemDef def ) + { + this.def = def; + return def; } } diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index 838a0291..7babf209 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -44,7 +44,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap>(); private final Item item; private final int meta; - public SharedSearchObject sso; + private SharedSearchObject sso; private int hash; private IItemComparison comp; @@ -72,7 +72,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound /* * Returns an NBT Compound that is used for accelerating comparisons. */ - public static synchronized NBTTagCompound getSharedTagCompound( final NBTTagCompound tagCompound, final ItemStack s ) + static synchronized NBTTagCompound getSharedTagCompound( final NBTTagCompound tagCompound, final ItemStack s ) { if( tagCompound.hasNoTags() ) { @@ -99,18 +99,18 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound final SharedSearchObject cg = c.get(); if( cg != null ) { - return cg.shared; // I don't think I really need to check this + return cg.getShared(); // I don't think I really need to check this } // as its already certain to exist.. } final AESharedNBT clone = AESharedNBT.createFromCompound( item, meta, tagCompound ); - sso.compound = (NBTTagCompound) sso.compound.copy(); // prevent + sso.setCompound( (NBTTagCompound) sso.getCompound().copy() ); // prevent // modification // of data based // on original // item. - sso.shared = clone; + sso.setShared( clone ); clone.sso = sso; SHARED_TAG_COMPOUND.put( sso, new WeakReference( sso ) ); @@ -125,7 +125,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound return ta instanceof AESharedNBT; } - public static AESharedNBT createFromCompound( final Item itemID, final int damageValue, final NBTTagCompound c ) + private static AESharedNBT createFromCompound( final Item itemID, final int damageValue, final NBTTagCompound c ) { final AESharedNBT x = new AESharedNBT( itemID, damageValue ); @@ -145,7 +145,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound return x; } - public int getHash() + int getHash() { return this.hash; } diff --git a/src/main/java/appeng/util/item/AEStack.java b/src/main/java/appeng/util/item/AEStack.java index e357ba4b..c3ecb223 100644 --- a/src/main/java/appeng/util/item/AEStack.java +++ b/src/main/java/appeng/util/item/AEStack.java @@ -29,9 +29,9 @@ import appeng.api.storage.data.IAEStack; public abstract class AEStack implements IAEStack { - protected boolean isCraftable; - protected long stackSize; - protected long countRequestable; + private boolean isCraftable; + private long stackSize; + private long countRequestable; static long getPacketValue( final byte type, final ByteBuf tag ) { @@ -151,7 +151,7 @@ public abstract class AEStack implements IAEStack implements IAEStack if( ais.isOre() ) { - final OreReference or = ais.def.isOre; + final OreReference or = ais.getDefinition().getIsOre(); if( or.getAEEquivalents().size() == 1 ) { diff --git a/src/main/java/appeng/util/item/ItemModList.java b/src/main/java/appeng/util/item/ItemModList.java index 66e0be9f..41d9087c 100644 --- a/src/main/java/appeng/util/item/ItemModList.java +++ b/src/main/java/appeng/util/item/ItemModList.java @@ -30,8 +30,8 @@ import appeng.api.storage.data.IItemContainer; public class ItemModList implements IItemContainer { - final IItemContainer backingStore; - final IItemContainer overrides = AEApi.instance().storage().createItemList(); + private final IItemContainer backingStore; + private final IItemContainer overrides = AEApi.instance().storage().createItemList(); public ItemModList( final IItemContainer backend ) { diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 165e70d5..6a3282b2 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -112,10 +112,10 @@ public class OreHelper return this.references.get( ir ); } - public boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is ) + boolean sameOre( final AEItemStack aeItemStack, final IAEItemStack is ) { - final OreReference a = aeItemStack.def.isOre; - final OreReference b = aeItemStack.def.isOre; + final OreReference a = aeItemStack.getDefinition().getIsOre(); + final OreReference b = aeItemStack.getDefinition().getIsOre(); return this.sameOre( a, b ); } @@ -144,9 +144,9 @@ public class OreHelper return false; } - public boolean sameOre( final AEItemStack aeItemStack, final ItemStack o ) + boolean sameOre( final AEItemStack aeItemStack, final ItemStack o ) { - final OreReference a = aeItemStack.def.isOre; + final OreReference a = aeItemStack.getDefinition().getIsOre(); if( a == null ) { return false; @@ -166,7 +166,7 @@ public class OreHelper return false; } - public List getCachedOres( final String oreName ) + List getCachedOres( final String oreName ) { return this.oreDictCache.getUnchecked( oreName ); } diff --git a/src/main/java/appeng/util/item/OreReference.java b/src/main/java/appeng/util/item/OreReference.java index d12464b3..07ba47de 100644 --- a/src/main/java/appeng/util/item/OreReference.java +++ b/src/main/java/appeng/util/item/OreReference.java @@ -38,12 +38,12 @@ public class OreReference private final Set ores = new HashSet(); private List aeOtherOptions = null; - public Collection getEquivalents() + Collection getEquivalents() { return this.otherOptions; } - public List getAEEquivalents() + List getAEEquivalents() { if( this.aeOtherOptions == null ) { @@ -65,7 +65,7 @@ public class OreReference return this.aeOtherOptions; } - public Collection getOres() + Collection getOres() { return this.ores; } diff --git a/src/main/java/appeng/util/item/SharedSearchObject.java b/src/main/java/appeng/util/item/SharedSearchObject.java index 8bba4fa3..970eecac 100644 --- a/src/main/java/appeng/util/item/SharedSearchObject.java +++ b/src/main/java/appeng/util/item/SharedSearchObject.java @@ -28,16 +28,16 @@ import appeng.util.Platform; public class SharedSearchObject { - final int def; - final int hash; - public AESharedNBT shared; - NBTTagCompound compound; + private final int def; + private final int hash; + private AESharedNBT shared; + private NBTTagCompound compound; public SharedSearchObject( final Item itemID, final int damageValue, final NBTTagCompound tagCompound ) { this.def = ( damageValue << Platform.DEF_OFFSET ) | Item.itemRegistry.getIDForObject( itemID ); this.hash = Platform.NBTOrderlessHash( tagCompound ); - this.compound = tagCompound; + this.setCompound( tagCompound ); } @Override @@ -60,8 +60,28 @@ public class SharedSearchObject final SharedSearchObject other = (SharedSearchObject) obj; if( this.def == other.def && this.hash == other.hash ) { - return Platform.NBTEqualityTest( this.compound, other.compound ); + return Platform.NBTEqualityTest( this.getCompound(), other.getCompound() ); } return false; } + + AESharedNBT getShared() + { + return this.shared; + } + + void setShared( final AESharedNBT shared ) + { + this.shared = shared; + } + + NBTTagCompound getCompound() + { + return this.compound; + } + + void setCompound( final NBTTagCompound compound ) + { + this.compound = compound; + } } diff --git a/src/main/java/appeng/util/item/UnsortedItemList.java b/src/main/java/appeng/util/item/UnsortedItemList.java index 15a0630d..5e913bcf 100644 --- a/src/main/java/appeng/util/item/UnsortedItemList.java +++ b/src/main/java/appeng/util/item/UnsortedItemList.java @@ -51,7 +51,7 @@ public final class UnsortedItemList implements IItemList { @Override - public boolean apply( @Nonnull IAEItemStack input ) + public boolean apply( @Nonnull final IAEItemStack input ) { return input.isMeaningful(); } @@ -60,7 +60,7 @@ public final class UnsortedItemList implements IItemList private final Map records = new HashMap(); @Override - public void add( IAEItemStack option ) + public void add( final IAEItemStack option ) { if( option == null ) { @@ -81,7 +81,7 @@ public final class UnsortedItemList implements IItemList } @Override - public IAEItemStack findPrecise( IAEItemStack itemStack ) + public IAEItemStack findPrecise( final IAEItemStack itemStack ) { if( itemStack == null ) { @@ -136,7 +136,7 @@ public final class UnsortedItemList implements IItemList */ @Override @Deprecated - public Collection findFuzzy( IAEItemStack filter, FuzzyMode fuzzy ) + public Collection findFuzzy( final IAEItemStack filter, final FuzzyMode fuzzy ) { throw new UnsupportedOperationException( "Unsupported on an unsorted collection" ); } @@ -148,7 +148,7 @@ public final class UnsortedItemList implements IItemList */ @Override @Deprecated - public void addStorage( IAEItemStack option ) + public void addStorage( final IAEItemStack option ) { throw new UnsupportedOperationException( "Purely designed for item storage" ); } @@ -160,7 +160,7 @@ public final class UnsortedItemList implements IItemList */ @Override @Deprecated - public void addCrafting( IAEItemStack option ) + public void addCrafting( final IAEItemStack option ) { throw new UnsupportedOperationException( "Purely designed for item storage" ); } @@ -172,7 +172,7 @@ public final class UnsortedItemList implements IItemList */ @Override @Deprecated - public void addRequestable( IAEItemStack option ) + public void addRequestable( final IAEItemStack option ) { throw new UnsupportedOperationException( "Purely designed for item storage" ); } diff --git a/src/main/java/appeng/util/iterators/StackToSlotIterator.java b/src/main/java/appeng/util/iterators/StackToSlotIterator.java index 50726226..aae4c544 100644 --- a/src/main/java/appeng/util/iterators/StackToSlotIterator.java +++ b/src/main/java/appeng/util/iterators/StackToSlotIterator.java @@ -29,9 +29,9 @@ import appeng.util.inv.ItemSlot; public class StackToSlotIterator implements Iterator { - final ItemSlot iss = new ItemSlot(); - final Iterator is; - int x = 0; + private final ItemSlot iss = new ItemSlot(); + private final Iterator is; + private int x = 0; public StackToSlotIterator( final Iterator is ) { @@ -47,7 +47,7 @@ public class StackToSlotIterator implements Iterator @Override public ItemSlot next() { - this.iss.slot = this.x; + this.iss.setSlot( this.x ); this.x++; this.iss.setItemStack( this.is.next() ); return this.iss; diff --git a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java index bde03441..04339e5d 100644 --- a/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/DefaultPriorityList.java @@ -28,7 +28,7 @@ import appeng.api.storage.data.IAEStack; public class DefaultPriorityList> implements IPartitionList { - static final List NULL_LIST = new ArrayList(); + private static final List NULL_LIST = new ArrayList(); @Override public boolean isListed( final T input ) diff --git a/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java b/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java index 9d2d3c47..267b4517 100644 --- a/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/FuzzyPriorityList.java @@ -29,8 +29,8 @@ import appeng.api.storage.data.IItemList; public class FuzzyPriorityList> implements IPartitionList { - final IItemList list; - final FuzzyMode mode; + private final IItemList list; + private final FuzzyMode mode; public FuzzyPriorityList( final IItemList in, final FuzzyMode mode ) { diff --git a/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java b/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java index c4390186..796fcd9d 100644 --- a/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java +++ b/src/main/java/appeng/util/prioitylist/PrecisePriorityList.java @@ -26,7 +26,7 @@ import appeng.api.storage.data.IItemList; public class PrecisePriorityList> implements IPartitionList { - final IItemList list; + private final IItemList list; public PrecisePriorityList( final IItemList in ) { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index 2adeb743..81ca99ad 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -55,8 +55,8 @@ import appeng.worldgen.meteorite.MeteoriteBlockPutter; public final class MeteoritePlacer { - public static final double PRESSES_SPAWN_CHANCE = 0.7; - public static final int SKYSTONE_SPAWN_LIMIT = 12; + private static final double PRESSES_SPAWN_CHANCE = 0.7; + private static final int SKYSTONE_SPAWN_LIMIT = 12; private final Collection validSpawn = new HashSet(); private final Collection invalidSpawn = new HashSet(); private final IBlockDefinition skyChestDefinition; @@ -109,7 +109,7 @@ public final class MeteoritePlacer this.type = new Fallout( this.putter, this.skyStoneDefinition ); } - public boolean spawnMeteorite( final IMeteoriteWorld w, final NBTTagCompound meteoriteBlob ) + boolean spawnMeteorite( final IMeteoriteWorld w, final NBTTagCompound meteoriteBlob ) { this.settings = meteoriteBlob; @@ -436,7 +436,7 @@ public final class MeteoritePlacer } } - public double getSqDistance( final int x, final int z ) + double getSqDistance( final int x, final int z ) { final int chunkX = this.settings.getInteger( "x" ) - x; final int chunkZ = this.settings.getInteger( "z" ) - z; @@ -579,7 +579,7 @@ public final class MeteoritePlacer return false; } - public NBTTagCompound getSettings() + NBTTagCompound getSettings() { return this.settings; } diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index ec2e0d6a..55e0ddab 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -113,12 +113,12 @@ public final class MeteoriteWorldGen implements IWorldGenerator return WorldData.instance().spawnData().getNearByMeteorites( w.provider.dimensionId, chunkX, chunkZ ); } - class MeteoriteSpawn implements IWorldCallable + private class MeteoriteSpawn implements IWorldCallable { - final int x; - final int z; - final int depth; + private final int x; + private final int z; + private final int depth; public MeteoriteSpawn( final int x, final int depth, final int z ) { diff --git a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java index 695f8705..3da8f6d8 100644 --- a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java +++ b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java @@ -12,10 +12,10 @@ import appeng.util.Platform; public class ChunkOnly extends StandardWorld { - final Chunk target; - final int cx; - final int cz; - int verticalBits = 0; + private final Chunk target; + private final int cx; + private final int cz; + private int verticalBits = 0; public ChunkOnly( final World w, final int cx, final int cz ) { @@ -75,7 +75,7 @@ public class ChunkOnly extends StandardWorld if( this.range( x, y, z ) ) { this.verticalBits |= 1 << ( y >> 4 ); - this.w.setBlock( x, y, z, blk, 0, 1 ); + this.getWorld().setBlock( x, y, z, blk, 0, 1 ); } } @@ -85,7 +85,7 @@ public class ChunkOnly extends StandardWorld if( this.range( x, y, z ) ) { this.verticalBits |= 1 << ( y >> 4 ); - this.w.setBlock( x, y, z, block, meta, flags & ( ~2 ) ); + this.getWorld().setBlock( x, y, z, block, meta, flags & ( ~2 ) ); } } diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java index 058cc119..18d427dd 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java @@ -10,9 +10,9 @@ import appeng.util.Platform; public class FalloutCopy extends Fallout { - public static final double SPECIFIED_BLOCK_THRESHOLD = 0.9; - public static final double AIR_BLOCK_THRESHOLD = 0.8; - public static final double BLOCK_THRESHOLD_STEP = 0.1; + private static final double SPECIFIED_BLOCK_THRESHOLD = 0.9; + private static final double AIR_BLOCK_THRESHOLD = 0.8; + private static final double BLOCK_THRESHOLD_STEP = 0.1; private final Block block; private final int meta; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java index 153742fa..dbc4afd3 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java @@ -9,7 +9,7 @@ import appeng.api.definitions.IBlockDefinition; public class FalloutSand extends FalloutCopy { - public static final double GLASS_THRESHOLD = 0.66; + private static final double GLASS_THRESHOLD = 0.66; private final MeteoriteBlockPutter putter; public FalloutSand( final IMeteoriteWorld w, final int x, final int y, final int z, final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition ) diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java index 69b73ccd..e5914301 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java @@ -9,8 +9,8 @@ import appeng.api.definitions.IBlockDefinition; public class FalloutSnow extends FalloutCopy { - public static final double SNOW_THRESHOLD = 0.7; - public static final double ICE_THRESHOLD = 0.5; + private static final double SNOW_THRESHOLD = 0.7; + private static final double ICE_THRESHOLD = 0.5; private final MeteoriteBlockPutter putter; public FalloutSnow( final IMeteoriteWorld w, final int x, final int y, final int z, final MeteoriteBlockPutter putter, final IBlockDefinition skyStoneDefinition ) diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java index c892ae62..2ceb9b6f 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java @@ -21,7 +21,7 @@ public class MeteoriteBlockPutter return true; } - public void put( final IMeteoriteWorld w, final int i, final int j, final int k, final Block blk, final int meta ) + void put( final IMeteoriteWorld w, final int i, final int j, final int k, final Block blk, final int meta ) { if( w.getBlock( i, j, k ) == Blocks.bedrock ) { diff --git a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java index 9c8df169..a1ea2295 100644 --- a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java @@ -12,7 +12,7 @@ import appeng.util.Platform; public class StandardWorld implements IMeteoriteWorld { - protected final World w; + private final World w; public StandardWorld( final World w ) { @@ -46,7 +46,7 @@ public class StandardWorld implements IMeteoriteWorld @Override public boolean hasNoSky() { - return !this.w.provider.hasNoSky; + return !this.getWorld().provider.hasNoSky; } @Override @@ -54,7 +54,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - return this.w.getBlockMetadata( x, y, z ); + return this.getWorld().getBlockMetadata( x, y, z ); } return 0; } @@ -64,7 +64,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - return this.w.getBlock( x, y, z ); + return this.getWorld().getBlock( x, y, z ); } return Platform.AIR_BLOCK; } @@ -74,7 +74,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - return this.w.canBlockSeeTheSky( x, y, z ); + return this.getWorld().canBlockSeeTheSky( x, y, z ); } return false; } @@ -84,7 +84,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - return this.w.getTileEntity( x, y, z ); + return this.getWorld().getTileEntity( x, y, z ); } return null; } @@ -100,7 +100,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - this.w.setBlock( x, y, z, blk ); + this.getWorld().setBlock( x, y, z, blk ); } } @@ -109,7 +109,7 @@ public class StandardWorld implements IMeteoriteWorld { if( this.range( x, y, z ) ) { - this.w.setBlock( x, y, z, block, meta, flags ); + this.getWorld().setBlock( x, y, z, block, meta, flags ); } }