From 73b110915aa119da2b8628a3c5c6366fccff60f3 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Fri, 6 Mar 2015 16:45:05 +0100 Subject: [PATCH] move redstone engines to core, split out base engine code in core, create core.lib as a place for public-facing utility classes --- common/buildcraft/BuildCraftCore.java | 26 +++- common/buildcraft/BuildCraftEnergy.java | 53 ++++---- common/buildcraft/BuildCraftFactory.java | 4 +- common/buildcraft/BuildCraftMod.java | 2 +- common/buildcraft/BuildCraftSilicon.java | 4 +- common/buildcraft/BuildCraftTransport.java | 7 +- .../buildcraft/builders/BlockArchitect.java | 4 +- .../builders/BlockBlueprintLibrary.java | 2 +- common/buildcraft/builders/BlockBuilder.java | 6 +- .../builders/BlockConstructionMarker.java | 2 +- common/buildcraft/builders/BlockFiller.java | 4 +- common/buildcraft/builders/BlockMarker.java | 4 +- .../buildcraft/builders/BlockPathMarker.java | 2 +- common/buildcraft/builders/ItemBlueprint.java | 6 +- .../builders/ItemBlueprintStandard.java | 2 +- .../builders/ItemBlueprintTemplate.java | 2 +- .../builders/ItemConstructionMarker.java | 2 +- common/buildcraft/builders/TileArchitect.java | 16 +-- .../builders/TileBlueprintLibrary.java | 13 +- common/buildcraft/builders/TileBuilder.java | 24 ++-- .../builders/TileConstructionMarker.java | 12 +- common/buildcraft/builders/TileFiller.java | 12 +- common/buildcraft/builders/TileMarker.java | 6 +- .../blueprints/RecursiveBlueprintReader.java | 2 +- .../builders/gui/ContainerArchitect.java | 4 +- .../gui/ContainerBlueprintLibrary.java | 4 +- .../builders/gui/ContainerBuilder.java | 2 +- .../builders/gui/ContainerFiller.java | 6 +- .../buildcraft/builders/gui/GuiArchitect.java | 17 ++- .../builders/gui/GuiBlueprintLibrary.java | 4 +- .../buildcraft/builders/gui/GuiBuilder.java | 14 +-- common/buildcraft/builders/gui/GuiFiller.java | 16 +-- .../builders/gui/SlotArchitect.java | 2 +- .../builders/gui/SlotBlueprintLibrary.java | 2 +- .../builders/urbanism/BlockUrbanist.java | 2 +- .../builders/urbanism/ContainerUrbanist.java | 2 +- .../builders/urbanism/GuiUrbanist.java | 4 +- .../builders/urbanism/TileUrbanist.java | 12 +- .../builders/urbanism/UrbanistTool.java | 2 +- .../builders/urbanism/UrbanistToolFiller.java | 4 +- common/buildcraft/core/BlockEngine.java | 56 +++++++++ common/buildcraft/core/Box.java | 2 +- common/buildcraft/core/CoreGuiHandler.java | 4 +- common/buildcraft/core/ItemGear.java | 2 + common/buildcraft/core/ItemList.java | 5 +- common/buildcraft/core/ItemMapLocation.java | 5 +- common/buildcraft/core/ItemSpring.java | 1 + common/buildcraft/core/ItemWrench.java | 1 + .../{energy => core}/SchematicEngine.java | 9 +- common/buildcraft/core/StackAtPosition.java | 3 +- common/buildcraft/core/TileEngine.java | 32 +++++ .../{energy => core}/TileEngineWood.java | 3 +- common/buildcraft/core/ZoneChunk.java | 5 +- .../buildcraft/core/blueprints/Blueprint.java | 2 +- .../core/blueprints/BlueprintId.java | 3 +- .../core/blueprints/BptBuilderBase.java | 2 +- .../core/blueprints/BptBuilderBlueprint.java | 8 +- .../core/blueprints/BptBuilderTemplate.java | 4 +- .../buildcraft/core/blueprints/Template.java | 2 +- .../core/builders/BuildingSlotBlock.java | 2 +- .../core/builders/TileAbstractBuilder.java | 12 +- .../core/builders/patterns/FillerPattern.java | 2 +- .../patterns/PatternParameterYDir.java | 2 +- .../core/{ => lib}/EntityBlock.java | 2 +- .../core/{ => lib}/ITileBufferHolder.java | 2 +- .../buildcraft/core/{ => lib}/RFBattery.java | 2 +- .../buildcraft/core/{ => lib}/TileBuffer.java | 4 +- .../core/{ => lib/block}/BlockBuildCraft.java | 5 +- .../core/{ => lib/block}/TileBuildCraft.java | 14 ++- .../lib/engines/BlockEngineBase.java} | 119 ++++-------------- .../lib/engines}/ItemEngine.java | 19 +-- .../lib/engines}/RenderEngine.java | 7 +- .../lib/engines/TileEngineBase.java} | 55 ++------ .../core/{ => lib}/fluids/RestrictedTank.java | 2 +- .../core/{ => lib}/fluids/SingleUseTank.java | 2 +- .../core/{ => lib}/fluids/Tank.java | 6 +- .../core/{ => lib}/fluids/TankManager.java | 2 +- .../core/{ => lib}/fluids/TankUtils.java | 6 +- .../core/{ => lib}/gui/AdvancedSlot.java | 2 +- .../{ => lib}/gui/BuildCraftContainer.java | 12 +- .../core/{ => lib}/gui/ContainerList.java | 11 +- .../core/{ => lib}/gui/FluidSlot.java | 6 +- .../{ => lib}/gui/GuiAdvancedInterface.java | 2 +- .../core/{ => lib}/gui/GuiBuildCraft.java | 16 +-- .../core/{ => lib}/gui/GuiList.java | 2 +- .../core/{ => lib}/gui/GuiTools.java | 4 +- .../core/{ => lib}/gui/IInventorySlot.java | 2 +- .../core/{ => lib}/gui/ItemSlot.java | 2 +- .../{ => lib}/gui/StatementParameterSlot.java | 2 +- .../core/{ => lib}/gui/StatementSlot.java | 2 +- .../gui/buttons/ButtonTextureSet.java | 2 +- .../gui/buttons/GuiBetterButton.java | 6 +- .../{ => lib}/gui/buttons/GuiButtonSmall.java | 2 +- .../{ => lib}/gui/buttons/GuiImageButton.java | 2 +- .../{ => lib}/gui/buttons/GuiMultiButton.java | 4 +- .../gui/buttons/GuiToggleButton.java | 2 +- .../gui/buttons/GuiToggleButtonSmall.java | 2 +- .../buttons/IButtonClickEventListener.java | 2 +- .../gui/buttons/IButtonClickEventTrigger.java | 2 +- .../gui/buttons/IButtonTextureSet.java | 2 +- .../gui/buttons/IMultiButtonState.java | 4 +- .../gui/buttons/LockButtonState.java | 4 +- .../gui/buttons/MultiButtonController.java | 2 +- .../buttons/StandardButtonTextureSets.java | 2 +- .../{ => lib}/gui/slots/IPhantomSlot.java | 2 +- .../core/{ => lib}/gui/slots/SlotBase.java | 6 +- .../core/{ => lib}/gui/slots/SlotHidden.java | 2 +- .../core/{ => lib}/gui/slots/SlotLimited.java | 2 +- .../core/{ => lib}/gui/slots/SlotOutput.java | 2 +- .../core/{ => lib}/gui/slots/SlotPhantom.java | 2 +- .../{ => lib}/gui/slots/SlotUntouchable.java | 2 +- .../{ => lib}/gui/slots/SlotValidated.java | 2 +- .../{ => lib}/gui/slots/SlotWorkbench.java | 2 +- .../gui/tooltips/IToolTipProvider.java | 2 +- .../core/{ => lib}/gui/tooltips/ToolTip.java | 2 +- .../{ => lib}/gui/tooltips/ToolTipLine.java | 2 +- .../{ => lib}/gui/widgets/ButtonWidget.java | 4 +- .../gui/widgets/FluidGaugeWidget.java | 10 +- .../gui/widgets/IIndicatorController.java | 4 +- .../gui/widgets/IndicatorController.java | 6 +- .../gui/widgets/IndicatorWidget.java | 6 +- .../core/{ => lib}/gui/widgets/Widget.java | 10 +- .../core/{ => lib}/inventory/CrafterCopy.java | 2 +- .../{ => lib}/inventory/FluidHandlerCopy.java | 2 +- .../core/{ => lib}/inventory/ITransactor.java | 4 +- .../core/{ => lib}/inventory/InvUtils.java | 4 +- .../inventory/InventoryConcatenator.java | 2 +- .../{ => lib}/inventory/InventoryCopy.java | 2 +- .../inventory/InventoryIterator.java | 2 +- .../inventory/InventoryIteratorSided.java | 2 +- .../inventory/InventoryIteratorSimple.java | 2 +- .../{ => lib}/inventory/InventoryMapper.java | 2 +- .../{ => lib}/inventory/InventoryWrapper.java | 2 +- .../inventory/InventoryWrapperSimple.java | 4 +- .../{ => lib}/inventory/SimpleInventory.java | 2 +- .../core/{ => lib}/inventory/StackHelper.java | 2 +- .../core/{ => lib}/inventory/Transactor.java | 2 +- .../inventory/TransactorRoundRobin.java | 2 +- .../{ => lib}/inventory/TransactorSimple.java | 4 +- .../inventory/filters/AggregateFilter.java | 2 +- .../inventory/filters/ArrayFluidFilter.java | 2 +- .../inventory/filters/ArrayStackFilter.java | 4 +- .../filters/ArrayStackOrListFilter.java | 4 +- .../inventory/filters/CompositeFilter.java | 2 +- .../inventory/filters/CraftingFilter.java | 4 +- .../inventory/filters/IFluidFilter.java | 2 +- .../inventory/filters/IStackFilter.java | 2 +- .../filters/InvertedStackFilter.java | 2 +- .../inventory/filters/OreStackFilter.java | 2 +- .../filters/PassThroughFluidFilter.java | 2 +- .../filters/PassThroughStackFilter.java | 2 +- .../inventory/filters/SimpleFluidFilter.java | 2 +- .../inventory/filters/StackFilter.java | 2 +- .../StatementParameterStackFilter.java | 2 +- .../{ => lib/items}/ItemBlockBuildCraft.java | 2 +- .../core/{ => lib/items}/ItemBuildCraft.java | 3 +- .../{ => lib}/network/ChannelHandler.java | 3 +- .../{ => lib}/network/IGuiReturnHandler.java | 2 +- .../core/{ => lib}/network/ISyncedTile.java | 2 +- .../core/{ => lib}/network/Packet.java | 2 +- .../{ => lib}/network/PacketCoordinates.java | 2 +- .../{ => lib}/network/PacketGuiReturn.java | 3 +- .../{ => lib}/network/PacketGuiWidget.java | 5 +- .../core/{ => lib}/network/PacketHandler.java | 4 +- .../core/{ => lib}/network/PacketNBT.java | 2 +- .../{ => lib}/network/PacketSlotChange.java | 5 +- .../{ => lib}/network/PacketTileState.java | 3 +- .../{ => lib}/network/PacketTileUpdate.java | 3 +- .../core/{ => lib}/network/PacketUpdate.java | 2 +- .../core/{ => lib}/network/Serializable.java | 2 +- .../network/command}/CommandTarget.java | 2 +- .../command}/CommandTargetContainer.java | 2 +- .../network/command}/CommandTargetEntity.java | 2 +- .../network/command}/CommandTargetTile.java | 2 +- .../network/command}/CommandWriter.java | 2 +- .../network/command}/ICommandReceiver.java | 2 +- .../network/command}/PacketCommand.java | 6 +- .../render/DynamicTexturePaletted.java} | 6 +- .../core/{ => lib}/render/FluidRenderer.java | 4 +- .../{ => lib/render}/ICustomHighlight.java | 2 +- .../{ => lib/render}/IInventoryRenderer.java | 2 +- .../{ => lib}/render/RenderEntityBlock.java | 4 +- .../core/{ => lib}/render/RenderUtils.java | 2 +- .../core/{ => lib}/render/RenderVoid.java | 2 +- .../core/{ => lib}/utils/Average.java | 2 +- .../core/{ => lib}/utils/BitSetUtils.java | 2 +- .../lib/utils}/BlockMiner.java | 5 +- .../core/{ => lib}/utils/BlockScanner.java | 2 +- .../utils/BlockScannerExpanding.java | 2 +- .../{ => lib}/utils/BlockScannerRandom.java | 2 +- .../utils/BlockScannerZoneRandom.java | 2 +- .../core/{ => lib}/utils/BlockUtils.java | 2 +- .../core/{ => lib}/utils/ColorUtils.java | 2 +- .../core/{ => lib}/utils/ConfigUtils.java | 2 +- .../core/{ => lib}/utils/CraftingUtils.java | 2 +- .../core/{ => lib}/utils/FluidUtils.java | 2 +- .../core/{ => lib}/utils/IBlockFilter.java | 2 +- .../core/{ => lib}/utils/IEntityFilter.java | 2 +- .../{ => lib}/utils/IIterableAlgorithm.java | 2 +- .../utils/IterableAlgorithmRunner.java | 2 +- .../core/{ => lib}/utils/MathUtils.java | 2 +- .../{ => lib}/utils/MatrixTranformations.java | 2 +- .../core/{ => lib}/utils/NBTUtils.java | 2 +- .../core/{ => lib}/utils/NetworkUtils.java | 2 +- .../core/{ => lib}/utils/PathFinding.java | 2 +- .../{ => lib}/utils/PathFindingSearch.java | 2 +- .../core/{ => lib}/utils/RevolvingList.java | 2 +- .../core/{ => lib}/utils/SessionVars.java | 2 +- .../core/{ => lib}/utils/StringUtils.java | 2 +- .../core/{ => lib}/utils/Utils.java | 14 +-- common/buildcraft/core/network/EntityIds.java | 8 -- .../core/network/ISynchronizedTile.java | 13 -- common/buildcraft/core/proxy/CoreProxy.java | 7 +- .../core/proxy/CoreProxyClient.java | 16 ++- .../core/recipes/FlexibleRecipe.java | 6 +- .../core/render/BlockHighlightHandler.java | 2 +- .../buildcraft/core/render/RenderLaser.java | 3 +- .../core/render/RenderingEntityBlocks.java | 4 +- .../core/statements/ActionMachineControl.java | 2 +- .../core/statements/ActionRedstoneOutput.java | 2 +- .../StatementParameterDirection.java | 2 +- ...tatementParameterRedstoneGateSideOnly.java | 2 +- .../core/statements/TriggerEnergy.java | 2 +- .../statements/TriggerFluidContainer.java | 2 +- .../TriggerFluidContainerLevel.java | 2 +- .../core/statements/TriggerInventory.java | 6 +- .../statements/TriggerInventoryLevel.java | 6 +- .../core/statements/TriggerMachine.java | 2 +- .../core/statements/TriggerRedstoneInput.java | 2 +- common/buildcraft/energy/EnergyProxy.java | 1 - .../buildcraft/energy/EnergyProxyClient.java | 15 +-- .../buildcraft/energy/TileEngineCreative.java | 4 +- common/buildcraft/energy/TileEngineIron.java | 11 +- common/buildcraft/energy/TileEngineStone.java | 7 +- .../energy/TileEngineWithInventory.java | 6 +- .../energy/gui/ContainerEngine.java | 2 +- .../energy/gui/GuiCombustionEngine.java | 2 +- common/buildcraft/energy/gui/GuiEngine.java | 14 +-- .../buildcraft/energy/gui/GuiStoneEngine.java | 2 +- .../statements/EnergyStatementProvider.java | 4 +- .../energy/statements/TriggerEngineHeat.java | 10 +- .../factory/BlockAutoWorkbench.java | 2 +- common/buildcraft/factory/BlockFloodGate.java | 4 +- common/buildcraft/factory/BlockFrame.java | 2 +- common/buildcraft/factory/BlockHopper.java | 2 +- .../buildcraft/factory/BlockMiningWell.java | 4 +- common/buildcraft/factory/BlockPump.java | 4 +- common/buildcraft/factory/BlockQuarry.java | 4 +- common/buildcraft/factory/BlockRefinery.java | 6 +- common/buildcraft/factory/BlockTank.java | 4 +- .../factory/EntityMechanicalArm.java | 2 +- common/buildcraft/factory/FactoryProxy.java | 2 +- .../factory/FactoryProxyClient.java | 4 +- .../buildcraft/factory/TileAutoWorkbench.java | 16 +-- common/buildcraft/factory/TileFloodGate.java | 10 +- common/buildcraft/factory/TileHopper.java | 10 +- common/buildcraft/factory/TileMiningWell.java | 7 +- common/buildcraft/factory/TilePump.java | 16 +-- common/buildcraft/factory/TileQuarry.java | 7 +- common/buildcraft/factory/TileRefinery.java | 11 +- common/buildcraft/factory/TileTank.java | 6 +- .../factory/gui/ContainerAutoWorkbench.java | 12 +- .../factory/gui/ContainerHopper.java | 2 +- .../factory/gui/ContainerRefinery.java | 6 +- .../factory/gui/GuiAutoCrafting.java | 4 +- .../buildcraft/factory/gui/GuiRefinery.java | 6 +- .../factory/network/PacketHandlerFactory.java | 4 +- .../factory/render/RenderHopper.java | 2 +- .../factory/render/RenderRefinery.java | 8 +- .../buildcraft/factory/render/RenderTank.java | 4 +- .../schematics/SchematicAutoWorkbench.java | 2 +- .../buildcraft/robotics/BlockRequester.java | 4 +- common/buildcraft/robotics/BlockZonePlan.java | 4 +- .../robotics/BoardProgrammingRecipe.java | 3 +- common/buildcraft/robotics/EntityRobot.java | 13 +- .../robotics/ItemRedstoneBoard.java | 4 +- common/buildcraft/robotics/ItemRobot.java | 4 +- .../buildcraft/robotics/ItemRobotStation.java | 2 +- .../robotics/RobotStationPluggable.java | 2 +- common/buildcraft/robotics/TileRequester.java | 14 +-- common/buildcraft/robotics/TileZonePlan.java | 4 +- .../buildcraft/robotics/ai/AIRobotBreak.java | 2 +- .../ai/AIRobotCraftAssemblyTable.java | 16 +-- .../robotics/ai/AIRobotCraftFurnace.java | 12 +- .../robotics/ai/AIRobotCraftGeneric.java | 2 +- .../robotics/ai/AIRobotCraftWorkbench.java | 14 +-- .../robotics/ai/AIRobotDeliverRequested.java | 4 +- .../robotics/ai/AIRobotDisposeItems.java | 2 +- .../ai/AIRobotFetchAndEquipItemStack.java | 8 +- .../robotics/ai/AIRobotFetchItem.java | 4 +- .../robotics/ai/AIRobotGotoBlock.java | 4 +- .../ai/AIRobotGotoStationAndLoad.java | 2 +- .../ai/AIRobotGotoStationAndLoadFluids.java | 2 +- .../robotics/ai/AIRobotGotoStationToLoad.java | 6 +- .../ai/AIRobotGotoStationToLoadFluids.java | 2 +- .../ai/AIRobotGotoStationToUnload.java | 2 +- .../ai/AIRobotGotoStationToUnloadFluids.java | 2 +- .../buildcraft/robotics/ai/AIRobotLoad.java | 8 +- .../robotics/ai/AIRobotLoadFluids.java | 2 +- .../robotics/ai/AIRobotSearchBlock.java | 4 +- .../robotics/ai/AIRobotSearchBlockBase.java | 6 +- .../robotics/ai/AIRobotSearchEntity.java | 4 +- .../robotics/ai/AIRobotSearchRandomBlock.java | 6 +- .../ai/AIRobotSearchRandomGroundBlock.java | 2 +- .../ai/AIRobotSearchStackRequest.java | 4 +- .../robotics/ai/AIRobotStripesHandler.java | 2 +- .../buildcraft/robotics/ai/AIRobotUnload.java | 2 +- .../robotics/ai/AIRobotUnloadFluids.java | 2 +- .../robotics/boards/BoardRobotBomber.java | 10 +- .../robotics/boards/BoardRobotBomberNBT.java | 2 +- .../robotics/boards/BoardRobotBuilder.java | 2 +- .../robotics/boards/BoardRobotBuilderNBT.java | 2 +- .../robotics/boards/BoardRobotButcher.java | 4 +- .../robotics/boards/BoardRobotButcherNBT.java | 2 +- .../robotics/boards/BoardRobotCarrierNBT.java | 2 +- .../robotics/boards/BoardRobotCrafter.java | 2 +- .../robotics/boards/BoardRobotCrafterNBT.java | 2 +- .../robotics/boards/BoardRobotDelivery.java | 4 +- .../boards/BoardRobotDeliveryNBT.java | 2 +- .../robotics/boards/BoardRobotFarmer.java | 4 +- .../robotics/boards/BoardRobotFarmerNBT.java | 2 +- .../boards/BoardRobotFluidCarrierNBT.java | 2 +- .../boards/BoardRobotGenericBreakBlock.java | 4 +- .../boards/BoardRobotHarvesterNBT.java | 2 +- .../robotics/boards/BoardRobotKnight.java | 4 +- .../robotics/boards/BoardRobotKnightNBT.java | 2 +- .../boards/BoardRobotLeaveCutterNBT.java | 2 +- .../boards/BoardRobotLumberjackNBT.java | 2 +- .../robotics/boards/BoardRobotMinerNBT.java | 2 +- .../robotics/boards/BoardRobotPickerNBT.java | 2 +- .../robotics/boards/BoardRobotPlanter.java | 10 +- .../robotics/boards/BoardRobotPlanterNBT.java | 2 +- .../robotics/boards/BoardRobotPump.java | 2 +- .../robotics/boards/BoardRobotPumpNBT.java | 2 +- .../boards/BoardRobotShovelmanNBT.java | 2 +- .../robotics/boards/BoardRobotStripes.java | 4 +- .../robotics/boards/BoardRobotStripesNBT.java | 2 +- .../robotics/gui/ContainerRequester.java | 10 +- .../robotics/gui/ContainerZonePlan.java | 14 +-- .../buildcraft/robotics/gui/GuiRequester.java | 4 +- .../buildcraft/robotics/gui/GuiZonePlan.java | 36 +++--- .../robotics/render/RenderRobot.java | 3 +- .../statements/ActionRobotFilter.java | 16 +-- .../statements/ActionRobotFilterTool.java | 8 +- .../statements/ActionRobotGotoStation.java | 2 +- .../statements/ActionRobotWakeUp.java | 2 +- .../statements/ActionRobotWorkInArea.java | 2 +- .../statements/ActionStationAcceptFluids.java | 2 +- .../ActionStationAcceptItemsInv.java | 6 +- .../ActionStationAcceptItemsPipe.java | 2 +- .../statements/ActionStationAllowCraft.java | 2 +- .../statements/ActionStationForbidRobot.java | 2 +- .../statements/ActionStationInputItems.java | 2 +- .../ActionStationProvideFluids.java | 2 +- .../statements/ActionStationProvideItems.java | 2 +- .../statements/ActionStationRequestItems.java | 6 +- .../ActionStationRequestItemsMachine.java | 2 +- .../statements/StateStationProvideItems.java | 2 +- .../statements/StateStationRequestItems.java | 2 +- .../statements/TriggerRobotSleep.java | 2 +- common/buildcraft/silicon/BlockLaser.java | 4 +- .../buildcraft/silicon/BlockLaserTable.java | 4 +- common/buildcraft/silicon/ItemLaserTable.java | 2 +- .../silicon/ItemRedstoneChipset.java | 2 +- .../silicon/TileAdvancedCraftingTable.java | 26 ++-- .../buildcraft/silicon/TileAssemblyTable.java | 12 +- .../buildcraft/silicon/TileChargingTable.java | 2 +- .../silicon/TileIntegrationTable.java | 12 +- common/buildcraft/silicon/TileLaser.java | 4 +- .../silicon/TileLaserTableBase.java | 6 +- .../silicon/TileProgrammingTable.java | 12 +- .../gui/ContainerAdvancedCraftingTable.java | 8 +- .../silicon/gui/ContainerAssemblyTable.java | 2 +- .../silicon/gui/ContainerChargingTable.java | 4 +- .../gui/ContainerIntegrationTable.java | 8 +- .../gui/ContainerProgrammingTable.java | 2 +- .../silicon/gui/GuiAssemblyTable.java | 6 +- .../buildcraft/silicon/gui/GuiLaserTable.java | 6 +- .../silicon/gui/GuiProgrammingTable.java | 6 +- .../silicon/network/PacketHandlerSilicon.java | 4 +- .../transport/BlockFilteredBuffer.java | 2 +- .../transport/BlockGenericPipe.java | 8 +- .../buildcraft/transport/FacadePluggable.java | 2 +- common/buildcraft/transport/ItemFacade.java | 4 +- .../buildcraft/transport/ItemGateCopier.java | 4 +- common/buildcraft/transport/ItemPipe.java | 6 +- common/buildcraft/transport/ItemPipeWire.java | 2 +- common/buildcraft/transport/Pipe.java | 4 +- .../transport/PipeColoringRecipe.java | 2 +- .../transport/PipeToolTipManager.java | 2 +- .../buildcraft/transport/PipeTransport.java | 2 +- .../transport/PipeTransportFluids.java | 2 +- .../transport/PipeTransportItems.java | 6 +- .../transport/PipeTransportPower.java | 2 +- .../transport/TileFilteredBuffer.java | 4 +- .../buildcraft/transport/TileGenericPipe.java | 14 +-- .../buildcraft/transport/TravelingItem.java | 2 +- .../transport/gates/GateDefinition.java | 2 +- .../gates/GateExpansionBuildcraft.java | 2 +- .../transport/gates/GatePluggable.java | 2 +- .../buildcraft/transport/gates/ItemGate.java | 6 +- .../transport/gui/ContainerDiamondPipe.java | 4 +- .../gui/ContainerEmeraldFluidPipe.java | 4 +- .../transport/gui/ContainerEmeraldPipe.java | 4 +- .../transport/gui/ContainerEmzuliPipe.java | 18 +-- .../gui/ContainerFilteredBuffer.java | 6 +- .../transport/gui/ContainerGateInterface.java | 12 +- .../transport/gui/GuiDiamondPipe.java | 4 +- .../transport/gui/GuiEmeraldFluidPipe.java | 4 +- .../transport/gui/GuiEmeraldPipe.java | 12 +- .../transport/gui/GuiEmzuliPipe.java | 4 +- .../transport/gui/GuiFilteredBuffer.java | 2 +- .../transport/gui/GuiGateInterface.java | 10 +- .../transport/network/PacketFluidUpdate.java | 4 +- .../network/PacketHandlerTransport.java | 4 +- .../network/PacketPipeTransportItemStack.java | 4 +- .../PacketPipeTransportItemStackRequest.java | 2 +- .../network/PacketPipeTransportTraveler.java | 2 +- .../transport/network/PacketPowerUpdate.java | 2 +- .../transport/pipes/PipeFluidsDiamond.java | 7 +- .../transport/pipes/PipeFluidsEmerald.java | 7 +- .../transport/pipes/PipeFluidsWood.java | 2 +- .../transport/pipes/PipeItemsDaizuli.java | 2 +- .../transport/pipes/PipeItemsDiamond.java | 7 +- .../transport/pipes/PipeItemsEmerald.java | 13 +- .../transport/pipes/PipeItemsEmzuli.java | 6 +- .../transport/pipes/PipeItemsGold.java | 2 +- .../transport/pipes/PipeItemsLapis.java | 2 +- .../transport/pipes/PipeItemsObsidian.java | 8 +- .../transport/pipes/PipeItemsStripes.java | 4 +- .../transport/pipes/PipeItemsWood.java | 6 +- .../transport/pipes/PipeLogicIron.java | 2 +- .../transport/pipes/PipeLogicWood.java | 2 +- .../transport/pipes/PipePowerEmerald.java | 2 +- .../transport/pipes/PipePowerIron.java | 2 +- .../transport/pipes/PipePowerWood.java | 2 +- .../transport/pluggable/ItemLens.java | 6 +- .../transport/pluggable/ItemPlug.java | 2 +- .../transport/pluggable/ItemPowerAdapter.java | 2 +- .../transport/pluggable/LensPluggable.java | 4 +- .../transport/pluggable/PlugPluggable.java | 2 +- .../pluggable/PowerAdapterPluggable.java | 2 +- .../recipes/GateExpansionRecipe.java | 2 +- .../recipes/GateLogicSwapRecipe.java | 2 +- .../transport/render/FacadeItemRenderer.java | 2 +- .../transport/render/FacadeRenderHelper.java | 2 +- .../transport/render/PipeItemRenderer.java | 2 +- .../transport/render/PipeRendererTESR.java | 8 +- .../transport/render/PipeRendererWorld.java | 2 +- .../schematics/BptItemPipeFilters.java | 2 +- .../statements/ActionEnergyPulsar.java | 2 +- .../statements/ActionExtractionPreset.java | 2 +- .../statements/ActionParameterSignal.java | 2 +- .../transport/statements/ActionPipeColor.java | 2 +- .../statements/ActionRedstoneFaderOutput.java | 2 +- .../statements/ActionSignalOutput.java | 2 +- .../statements/ActionSingleEnergyPulse.java | 2 +- .../transport/statements/ActionValve.java | 2 +- .../statements/TriggerClockTimer.java | 2 +- .../statements/TriggerParameterSignal.java | 2 +- .../statements/TriggerPipeContents.java | 4 +- .../statements/TriggerPipeSignal.java | 2 +- .../statements/TriggerRedstoneFaderInput.java | 2 +- 463 files changed, 1157 insertions(+), 1165 deletions(-) create mode 100644 common/buildcraft/core/BlockEngine.java rename common/buildcraft/{energy => core}/SchematicEngine.java (85%) create mode 100644 common/buildcraft/core/TileEngine.java rename common/buildcraft/{energy => core}/TileEngineWood.java (97%) rename common/buildcraft/core/{ => lib}/EntityBlock.java (98%) rename common/buildcraft/core/{ => lib}/ITileBufferHolder.java (95%) rename common/buildcraft/core/{ => lib}/RFBattery.java (98%) rename common/buildcraft/core/{ => lib}/TileBuffer.java (96%) rename common/buildcraft/core/{ => lib/block}/BlockBuildCraft.java (95%) rename common/buildcraft/core/{ => lib/block}/TileBuildCraft.java (94%) rename common/buildcraft/{energy/BlockEngine.java => core/lib/engines/BlockEngineBase.java} (67%) rename common/buildcraft/{energy => core/lib/engines}/ItemEngine.java (69%) rename common/buildcraft/{energy/render => core/lib/engines}/RenderEngine.java (97%) rename common/buildcraft/{energy/TileEngine.java => core/lib/engines/TileEngineBase.java} (86%) rename common/buildcraft/core/{ => lib}/fluids/RestrictedTank.java (96%) rename common/buildcraft/core/{ => lib}/fluids/SingleUseTank.java (97%) rename common/buildcraft/core/{ => lib}/fluids/Tank.java (94%) rename common/buildcraft/core/{ => lib}/fluids/TankManager.java (98%) rename common/buildcraft/core/{ => lib}/fluids/TankUtils.java (96%) rename common/buildcraft/core/{ => lib}/gui/AdvancedSlot.java (98%) rename common/buildcraft/core/{ => lib}/gui/BuildCraftContainer.java (96%) rename common/buildcraft/core/{ => lib}/gui/ContainerList.java (92%) rename common/buildcraft/core/{ => lib}/gui/FluidSlot.java (89%) rename common/buildcraft/core/{ => lib}/gui/GuiAdvancedInterface.java (99%) rename common/buildcraft/core/{ => lib}/gui/GuiBuildCraft.java (97%) rename common/buildcraft/core/{ => lib}/gui/GuiList.java (99%) rename common/buildcraft/core/{ => lib}/gui/GuiTools.java (95%) rename common/buildcraft/core/{ => lib}/gui/IInventorySlot.java (96%) rename common/buildcraft/core/{ => lib}/gui/ItemSlot.java (95%) rename common/buildcraft/core/{ => lib}/gui/StatementParameterSlot.java (98%) rename common/buildcraft/core/{ => lib}/gui/StatementSlot.java (96%) rename common/buildcraft/core/{ => lib}/gui/buttons/ButtonTextureSet.java (94%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiBetterButton.java (95%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiButtonSmall.java (94%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiImageButton.java (98%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiMultiButton.java (96%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiToggleButton.java (97%) rename common/buildcraft/core/{ => lib}/gui/buttons/GuiToggleButtonSmall.java (94%) rename common/buildcraft/core/{ => lib}/gui/buttons/IButtonClickEventListener.java (91%) rename common/buildcraft/core/{ => lib}/gui/buttons/IButtonClickEventTrigger.java (92%) rename common/buildcraft/core/{ => lib}/gui/buttons/IButtonTextureSet.java (90%) rename common/buildcraft/core/{ => lib}/gui/buttons/IMultiButtonState.java (83%) rename common/buildcraft/core/{ => lib}/gui/buttons/LockButtonState.java (90%) rename common/buildcraft/core/{ => lib}/gui/buttons/MultiButtonController.java (98%) rename common/buildcraft/core/{ => lib}/gui/buttons/StandardButtonTextureSets.java (95%) rename common/buildcraft/core/{ => lib}/gui/slots/IPhantomSlot.java (92%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotBase.java (88%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotHidden.java (95%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotLimited.java (94%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotOutput.java (94%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotPhantom.java (95%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotUntouchable.java (96%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotValidated.java (94%) rename common/buildcraft/core/{ => lib}/gui/slots/SlotWorkbench.java (95%) rename common/buildcraft/core/{ => lib}/gui/tooltips/IToolTipProvider.java (91%) rename common/buildcraft/core/{ => lib}/gui/tooltips/ToolTip.java (97%) rename common/buildcraft/core/{ => lib}/gui/tooltips/ToolTipLine.java (94%) rename common/buildcraft/core/{ => lib}/gui/widgets/ButtonWidget.java (93%) rename common/buildcraft/core/{ => lib}/gui/widgets/FluidGaugeWidget.java (88%) rename common/buildcraft/core/{ => lib}/gui/widgets/IIndicatorController.java (81%) rename common/buildcraft/core/{ => lib}/gui/widgets/IndicatorController.java (83%) rename common/buildcraft/core/{ => lib}/gui/widgets/IndicatorWidget.java (88%) rename common/buildcraft/core/{ => lib}/gui/widgets/Widget.java (89%) rename common/buildcraft/core/{ => lib}/inventory/CrafterCopy.java (98%) rename common/buildcraft/core/{ => lib}/inventory/FluidHandlerCopy.java (97%) rename common/buildcraft/core/{ => lib}/inventory/ITransactor.java (90%) rename common/buildcraft/core/{ => lib}/inventory/InvUtils.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryConcatenator.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryCopy.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryIterator.java (96%) rename common/buildcraft/core/{ => lib}/inventory/InventoryIteratorSided.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryIteratorSimple.java (97%) rename common/buildcraft/core/{ => lib}/inventory/InventoryMapper.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryWrapper.java (98%) rename common/buildcraft/core/{ => lib}/inventory/InventoryWrapperSimple.java (92%) rename common/buildcraft/core/{ => lib}/inventory/SimpleInventory.java (99%) rename common/buildcraft/core/{ => lib}/inventory/StackHelper.java (99%) rename common/buildcraft/core/{ => lib}/inventory/Transactor.java (96%) rename common/buildcraft/core/{ => lib}/inventory/TransactorRoundRobin.java (97%) rename common/buildcraft/core/{ => lib}/inventory/TransactorSimple.java (97%) rename common/buildcraft/core/{ => lib}/inventory/filters/AggregateFilter.java (94%) rename common/buildcraft/core/{ => lib}/inventory/filters/ArrayFluidFilter.java (96%) rename common/buildcraft/core/{ => lib}/inventory/filters/ArrayStackFilter.java (92%) rename common/buildcraft/core/{ => lib}/inventory/filters/ArrayStackOrListFilter.java (89%) rename common/buildcraft/core/{ => lib}/inventory/filters/CompositeFilter.java (94%) rename common/buildcraft/core/{ => lib}/inventory/filters/CraftingFilter.java (91%) rename common/buildcraft/core/{ => lib}/inventory/filters/IFluidFilter.java (89%) rename common/buildcraft/core/{ => lib}/inventory/filters/IStackFilter.java (92%) rename common/buildcraft/core/{ => lib}/inventory/filters/InvertedStackFilter.java (93%) rename common/buildcraft/core/{ => lib}/inventory/filters/OreStackFilter.java (95%) rename common/buildcraft/core/{ => lib}/inventory/filters/PassThroughFluidFilter.java (92%) rename common/buildcraft/core/{ => lib}/inventory/filters/PassThroughStackFilter.java (92%) rename common/buildcraft/core/{ => lib}/inventory/filters/SimpleFluidFilter.java (94%) rename common/buildcraft/core/{ => lib}/inventory/filters/StackFilter.java (95%) rename common/buildcraft/core/{ => lib}/inventory/filters/StatementParameterStackFilter.java (95%) rename common/buildcraft/core/{ => lib/items}/ItemBlockBuildCraft.java (93%) rename common/buildcraft/core/{ => lib/items}/ItemBuildCraft.java (95%) rename common/buildcraft/core/{ => lib}/network/ChannelHandler.java (93%) rename common/buildcraft/core/{ => lib}/network/IGuiReturnHandler.java (93%) rename common/buildcraft/core/{ => lib}/network/ISyncedTile.java (95%) rename common/buildcraft/core/{ => lib}/network/Packet.java (93%) rename common/buildcraft/core/{ => lib}/network/PacketCoordinates.java (96%) rename common/buildcraft/core/{ => lib}/network/PacketGuiReturn.java (96%) rename common/buildcraft/core/{ => lib}/network/PacketGuiWidget.java (91%) rename common/buildcraft/core/{ => lib}/network/PacketHandler.java (94%) rename common/buildcraft/core/{ => lib}/network/PacketNBT.java (97%) rename common/buildcraft/core/{ => lib}/network/PacketSlotChange.java (89%) rename common/buildcraft/core/{ => lib}/network/PacketTileState.java (96%) rename common/buildcraft/core/{ => lib}/network/PacketTileUpdate.java (92%) rename common/buildcraft/core/{ => lib}/network/PacketUpdate.java (97%) rename common/buildcraft/core/{ => lib}/network/Serializable.java (86%) rename common/buildcraft/core/{network => lib/network/command}/CommandTarget.java (93%) rename common/buildcraft/core/{network => lib/network/command}/CommandTargetContainer.java (95%) rename common/buildcraft/core/{network => lib/network/command}/CommandTargetEntity.java (95%) rename common/buildcraft/core/{network => lib/network/command}/CommandTargetTile.java (96%) rename common/buildcraft/core/{network => lib/network/command}/CommandWriter.java (90%) rename common/buildcraft/core/{network => lib/network/command}/ICommandReceiver.java (91%) rename common/buildcraft/core/{network => lib/network/command}/PacketCommand.java (92%) rename common/buildcraft/core/{render/BCDynamicTexture.java => lib/render/DynamicTexturePaletted.java} (95%) rename common/buildcraft/core/{ => lib}/render/FluidRenderer.java (97%) rename common/buildcraft/core/{ => lib/render}/ICustomHighlight.java (94%) rename common/buildcraft/core/{ => lib/render}/IInventoryRenderer.java (93%) rename common/buildcraft/core/{ => lib}/render/RenderEntityBlock.java (98%) rename common/buildcraft/core/{ => lib}/render/RenderUtils.java (94%) rename common/buildcraft/core/{ => lib}/render/RenderVoid.java (95%) rename common/buildcraft/core/{ => lib}/utils/Average.java (96%) rename common/buildcraft/core/{ => lib}/utils/BitSetUtils.java (95%) rename common/buildcraft/{factory => core/lib/utils}/BlockMiner.java (96%) rename common/buildcraft/core/{ => lib}/utils/BlockScanner.java (98%) rename common/buildcraft/core/{ => lib}/utils/BlockScannerExpanding.java (97%) rename common/buildcraft/core/{ => lib}/utils/BlockScannerRandom.java (96%) rename common/buildcraft/core/{ => lib}/utils/BlockScannerZoneRandom.java (96%) rename common/buildcraft/core/{ => lib}/utils/BlockUtils.java (99%) rename common/buildcraft/core/{ => lib}/utils/ColorUtils.java (98%) rename common/buildcraft/core/{ => lib}/utils/ConfigUtils.java (99%) rename common/buildcraft/core/{ => lib}/utils/CraftingUtils.java (98%) rename common/buildcraft/core/{ => lib}/utils/FluidUtils.java (97%) rename common/buildcraft/core/{ => lib}/utils/IBlockFilter.java (92%) rename common/buildcraft/core/{ => lib}/utils/IEntityFilter.java (92%) rename common/buildcraft/core/{ => lib}/utils/IIterableAlgorithm.java (91%) rename common/buildcraft/core/{ => lib}/utils/IterableAlgorithmRunner.java (97%) rename common/buildcraft/core/{ => lib}/utils/MathUtils.java (95%) rename common/buildcraft/core/{ => lib}/utils/MatrixTranformations.java (98%) rename common/buildcraft/core/{ => lib}/utils/NBTUtils.java (97%) rename common/buildcraft/core/{ => lib}/utils/NetworkUtils.java (98%) rename common/buildcraft/core/{ => lib}/utils/PathFinding.java (99%) rename common/buildcraft/core/{ => lib}/utils/PathFindingSearch.java (99%) rename common/buildcraft/core/{ => lib}/utils/RevolvingList.java (97%) rename common/buildcraft/core/{ => lib}/utils/SessionVars.java (95%) rename common/buildcraft/core/{ => lib}/utils/StringUtils.java (95%) rename common/buildcraft/core/{ => lib}/utils/Utils.java (97%) delete mode 100644 common/buildcraft/core/network/ISynchronizedTile.java diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index e4929a82..5da2ccd5 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -75,6 +75,7 @@ import buildcraft.core.BCCreativeTab; import buildcraft.core.BlockSpring; import buildcraft.core.BuildCraftConfiguration; import buildcraft.core.CommandBuildCraft; +import buildcraft.core.CompatHooks; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; import buildcraft.core.CoreGuiHandler; @@ -88,8 +89,11 @@ import buildcraft.core.SpringPopulate; import buildcraft.core.TickHandlerCore; import buildcraft.core.Version; import buildcraft.core.blueprints.SchematicRegistry; -import buildcraft.core.network.ChannelHandler; -import buildcraft.core.network.PacketHandler; +import buildcraft.core.BlockEngine; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.TileEngineWood; +import buildcraft.core.lib.network.ChannelHandler; +import buildcraft.core.lib.network.PacketHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; @@ -109,7 +113,7 @@ import buildcraft.core.statements.TriggerInventory; import buildcraft.core.statements.TriggerInventoryLevel; import buildcraft.core.statements.TriggerMachine; import buildcraft.core.statements.TriggerRedstoneInput; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.core.properties.WorldPropertyIsDirt; import buildcraft.core.properties.WorldPropertyIsFarmland; import buildcraft.core.properties.WorldPropertyIsFluidSource; @@ -119,6 +123,8 @@ import buildcraft.core.properties.WorldPropertyIsOre; import buildcraft.core.properties.WorldPropertyIsShoveled; import buildcraft.core.properties.WorldPropertyIsSoft; import buildcraft.core.properties.WorldPropertyIsWood; +import buildcraft.core.lib.engines.ItemEngine; +import buildcraft.core.SchematicEngine; import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.fuels.FuelManager; @@ -143,6 +149,7 @@ public class BuildCraftCore extends BuildCraftMod { public static long longUpdateFactor = 40; public static BuildCraftConfiguration mainConfiguration; + public static BlockEngine engineBlock; public static Block springBlock; public static Item woodenGearItem; public static Item stoneGearItem; @@ -200,6 +207,7 @@ public class BuildCraftCore extends BuildCraftMod { public static Achievement goldGearAchievement; public static Achievement diamondGearAchievement; public static Achievement wrenchAchievement; + public static Achievement engineRedstoneAchievement; public static HashSet recipesBlacklist = new HashSet(); @@ -309,6 +317,11 @@ public class BuildCraftCore extends BuildCraftMod { CoreProxy.proxy.registerItem(diamondGearItem); OreDictionary.registerOre("gearDiamond", new ItemStack(diamondGearItem)); + engineBlock = (BlockEngine) CompatHooks.INSTANCE.getBlock(BlockEngine.class); + CoreProxy.proxy.registerBlock(engineBlock, ItemEngine.class); + engineBlock.registerTile((Class) CompatHooks.INSTANCE.getTile(TileEngineWood.class), "tile.engineWood"); + CoreProxy.proxy.registerTileEntity(TileEngineWood.class, "net.minecraft.src.buildcraft.energy.TileEngineWood"); + MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(new BlockHighlightHandler()); } finally { @@ -335,6 +348,7 @@ public class BuildCraftCore extends BuildCraftMod { goldGearAchievement = achievementManager.registerAchievement(new Achievement("achievement.goldGear", "goldGearAchievement", 6, 0, goldGearItem, ironGearAchievement)); diamondGearAchievement = achievementManager.registerAchievement(new Achievement("achievement.diamondGear", "diamondGearAchievement", 8, 0, diamondGearItem, goldGearAchievement)); wrenchAchievement = achievementManager.registerAchievement(new Achievement("achievement.wrench", "wrenchAchievement", 3, 2, wrenchItem, stoneGearAchievement)); + engineRedstoneAchievement = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.redstoneEngine", "engineAchievement1", 1, -2, new ItemStack(engineBlock, 1, 0), BuildCraftCore.woodenGearAchievement)); // BuildCraft 6.1.4 and below - migration only StatementManager.registerParameterClass("buildcraft:stackTrigger", StatementParameterItemStack.class); @@ -368,6 +382,8 @@ public class BuildCraftCore extends BuildCraftMod { EntityList.stringToClassMapping.remove("BuildCraft|Core.bcLaser"); EntityList.stringToClassMapping.remove("BuildCraft|Core.bcEnergyLaser"); + BuilderAPI.schematicRegistry.registerSchematicBlock(engineBlock, SchematicEngine.class); + CoreProxy.proxy.initializeRendering(); CoreProxy.proxy.initializeEntityRendering(); @@ -455,6 +471,10 @@ public class BuildCraftCore extends BuildCraftMod { CoreProxy.proxy.addCraftingRecipe(new ItemStack(mapLocationItem), "ppp", "pYp", "ppp", 'p', Items.paper, 'Y', "dyeYellow"); CoreProxy.proxy.addCraftingRecipe(new ItemStack(listItem), "ppp", "pYp", "ppp", 'p', Items.paper, 'Y', "dyeGreen"); + + CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 0), + "www", " g ", "GpG", 'w', "plankWood", 'g', "blockGlass", 'G', + "gearWood", 'p', Blocks.piston); } @Mod.EventHandler diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 7cd65a51..70ecf42c 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -25,10 +25,12 @@ import net.minecraft.world.biome.BiomeGenBase; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -41,7 +43,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.core.BCLog; import buildcraft.api.core.JavaTools; import buildcraft.api.core.StackKey; @@ -49,24 +50,23 @@ import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementManager; -import buildcraft.core.CompatHooks; import buildcraft.core.BlockSpring; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; -import buildcraft.core.network.ChannelHandler; +import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.energy.BlockBuildcraftFluid; -import buildcraft.energy.BlockEngine; import buildcraft.energy.BucketHandler; import buildcraft.energy.EnergyProxy; import buildcraft.energy.EnergyGuiHandler; import buildcraft.energy.IMCHandlerEnergy; import buildcraft.energy.ItemBucketBuildcraft; -import buildcraft.energy.ItemEngine; -import buildcraft.energy.SchematicEngine; -import buildcraft.energy.TileEngine; -import buildcraft.energy.TileEngine.EnergyStage; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.lib.engines.TileEngineBase.EnergyStage; +import buildcraft.energy.TileEngineCreative; +import buildcraft.energy.TileEngineIron; +import buildcraft.energy.TileEngineStone; import buildcraft.energy.statements.EnergyStatementProvider; import buildcraft.energy.statements.TriggerEngineHeat; import buildcraft.energy.worldgen.BiomeGenOilDesert; @@ -84,7 +84,6 @@ public class BuildCraftEnergy extends BuildCraftMod { public static boolean spawnOilSprings = true; public static BiomeGenOilDesert biomeOilDesert; public static BiomeGenOilOcean biomeOilOcean; - public static BlockEngine engineBlock; public static Fluid fluidOil; public static Fluid fluidFuel; public static Fluid fluidRedPlasma; @@ -175,9 +174,6 @@ public class BuildCraftEnergy extends BuildCraftMod { biomeOilOcean = BiomeGenOilOcean.makeBiome(oilOceanBiomeId); } - engineBlock = (BlockEngine) CompatHooks.INSTANCE.getBlock(BlockEngine.class); - CoreProxy.proxy.registerBlock(engineBlock, ItemEngine.class); - // Oil and fuel if (!FluidRegistry.isFluidRegistered("oil")) { buildcraftFluidOil = new Fluid("oil").setDensity(800).setViscosity(10000); @@ -281,6 +277,10 @@ public class BuildCraftEnergy extends BuildCraftMod { BuildcraftFuelRegistry.coolant.addCoolant(FluidRegistry.WATER, 0.0023f); BuildcraftFuelRegistry.coolant.addSolidCoolant(StackKey.stack(Blocks.ice), StackKey.fluid(FluidRegistry.WATER), 2f); + BuildCraftCore.engineBlock.registerTile(TileEngineStone.class, "tile.engineStone"); + BuildCraftCore.engineBlock.registerTile(TileEngineIron.class, "tile.engineIron"); + BuildCraftCore.engineBlock.registerTile(TileEngineCreative.class, "tile.engineCreative"); + InterModComms.registerHandler(new IMCHandlerEnergy()); MinecraftForge.EVENT_BUS.register(this); @@ -337,8 +337,6 @@ public class BuildCraftEnergy extends BuildCraftMod { StatementManager.registerTriggerProvider(new EnergyStatementProvider()); - BuilderAPI.schematicRegistry.registerSchematicBlock(engineBlock, SchematicEngine.class); - if (BuildCraftCore.loadDefaultRecipes) { loadRecipes(); } @@ -346,9 +344,8 @@ public class BuildCraftEnergy extends BuildCraftMod { EnergyProxy.proxy.registerBlockRenderers(); EnergyProxy.proxy.registerTileEntities(); - engineAchievement1 = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.redstoneEngine", "engineAchievement1", 1, -2, new ItemStack(engineBlock, 1, 0), BuildCraftCore.woodenGearAchievement)); - engineAchievement2 = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.stirlingEngine", "engineAchievement2", 3, -2, new ItemStack(engineBlock, 1, 1), engineAchievement1)); - engineAchievement3 = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.combustionEngine", "engineAchievement3", 5, -2, new ItemStack(engineBlock, 1, 2), engineAchievement2)); + engineAchievement2 = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.stirlingEngine", "engineAchievement2", 3, -2, new ItemStack(BuildCraftCore.engineBlock, 1, 1), BuildCraftCore.engineRedstoneAchievement)); + engineAchievement3 = BuildCraftCore.achievementManager.registerAchievement(new Achievement("achievement.combustionEngine", "engineAchievement3", 5, -2, new ItemStack(BuildCraftCore.engineBlock, 1, 2), engineAchievement2)); } @Mod.EventHandler @@ -376,13 +373,10 @@ public class BuildCraftEnergy extends BuildCraftMod { } public static void loadRecipes() { - CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 0), - "www", " g ", "GpG", 'w', "plankWood", 'g', "blockGlass", 'G', - "gearWood", 'p', Blocks.piston); - CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 1), + CoreProxy.proxy.addCraftingRecipe(new ItemStack(BuildCraftCore.engineBlock, 1, 1), "www", " g ", "GpG", 'w', "cobblestone", 'g', "blockGlass", 'G', "gearStone", 'p', Blocks.piston); - CoreProxy.proxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 2), + CoreProxy.proxy.addCraftingRecipe(new ItemStack(BuildCraftCore.engineBlock, 1, 2), "www", " g ", "GpG", 'w', "ingotIron", 'g', "blockGlass", 'G', "gearIron", 'p', Blocks.piston); } @@ -416,6 +410,19 @@ public class BuildCraftEnergy extends BuildCraftMod { @Mod.EventHandler public void whiteListAppliedEnergetics(FMLInitializationEvent event) { FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", - TileEngine.class.getCanonicalName()); + TileEngineBase.class.getCanonicalName()); + } + + @Mod.EventHandler + public void remap(FMLMissingMappingsEvent event) { + for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { + if (mapping.name.equals("BuildCraft|Energy:engineBlock")) { + if (mapping.type == GameRegistry.Type.BLOCK) { + mapping.remap(BuildCraftCore.engineBlock); + } else if (mapping.type == GameRegistry.Type.ITEM) { + mapping.remap(Item.getItemFromBlock(BuildCraftCore.engineBlock)); + } + } + } } } diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 7a7e68ad..ef56f09b 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -43,9 +43,9 @@ import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.Version; -import buildcraft.core.network.ChannelHandler; +import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.ConfigUtils; +import buildcraft.core.lib.utils.ConfigUtils; import buildcraft.factory.BlockAutoWorkbench; import buildcraft.factory.BlockFloodGate; import buildcraft.factory.BlockFrame; diff --git a/common/buildcraft/BuildCraftMod.java b/common/buildcraft/BuildCraftMod.java index 98606011..c0def5b0 100644 --- a/common/buildcraft/BuildCraftMod.java +++ b/common/buildcraft/BuildCraftMod.java @@ -24,7 +24,7 @@ import cpw.mods.fml.relauncher.Side; import buildcraft.api.core.BCLog; import buildcraft.core.DefaultProps; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; public class BuildCraftMod { public EnumMap channels; diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index f6c29b1e..72bc8e6a 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -34,9 +34,9 @@ import buildcraft.robotics.TileZonePlan; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.Version; -import buildcraft.core.network.ChannelHandler; +import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.silicon.BlockLaser; import buildcraft.silicon.BlockLaserTable; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 385462cc..01ac89fd 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -46,19 +46,18 @@ import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementManager; -import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.PipeWire; import buildcraft.core.CompatHooks; import buildcraft.core.BCCreativeTab; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.PowerMode; import buildcraft.core.Version; -import buildcraft.core.network.ChannelHandler; +import buildcraft.core.lib.network.ChannelHandler; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.transport.BlockFilteredBuffer; import buildcraft.transport.BlockGenericPipe; diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index c9305c0d..8ace2480 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -29,10 +29,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockArchitect extends BlockBuildCraft { IIcon blockTextureTop; diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 92019870..7e706bb5 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 4c0e332e..2f401555 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -29,11 +29,11 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; -import buildcraft.core.fluids.TankUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.fluids.TankUtils; +import buildcraft.core.lib.utils.Utils; public class BlockBuilder extends BlockBuildCraft { diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index 521a1157..95184508 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockConstructionMarker extends BlockMarker { diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index df87e073..13e26472 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -26,10 +26,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.filler.IFillerPattern; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockFiller extends BlockBuildCraft { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index ba921379..7a8bafef 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -26,9 +26,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.items.IMapLocation; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockMarker extends BlockBuildCraft { diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index cc0343d0..73c5a976 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockPathMarker extends BlockMarker { diff --git a/common/buildcraft/builders/ItemBlueprint.java b/common/buildcraft/builders/ItemBlueprint.java index 77de256f..02d6e6d1 100644 --- a/common/buildcraft/builders/ItemBlueprint.java +++ b/common/buildcraft/builders/ItemBlueprint.java @@ -18,10 +18,10 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuildingPermission; import buildcraft.core.blueprints.BlueprintId; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.blueprints.BlueprintBase; -import buildcraft.core.utils.NBTUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.NBTUtils; +import buildcraft.core.lib.utils.StringUtils; public abstract class ItemBlueprint extends ItemBuildCraft { diff --git a/common/buildcraft/builders/ItemBlueprintStandard.java b/common/buildcraft/builders/ItemBlueprintStandard.java index b47e4df0..5da1e7d5 100644 --- a/common/buildcraft/builders/ItemBlueprintStandard.java +++ b/common/buildcraft/builders/ItemBlueprintStandard.java @@ -15,7 +15,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; public class ItemBlueprintStandard extends ItemBlueprint { private IIcon cleanBlueprint; diff --git a/common/buildcraft/builders/ItemBlueprintTemplate.java b/common/buildcraft/builders/ItemBlueprintTemplate.java index e92c4e38..73108999 100644 --- a/common/buildcraft/builders/ItemBlueprintTemplate.java +++ b/common/buildcraft/builders/ItemBlueprintTemplate.java @@ -15,7 +15,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; public class ItemBlueprintTemplate extends ItemBlueprint { private IIcon cleanTemplate; diff --git a/common/buildcraft/builders/ItemConstructionMarker.java b/common/buildcraft/builders/ItemConstructionMarker.java index 87a05363..3e7eb915 100755 --- a/common/buildcraft/builders/ItemConstructionMarker.java +++ b/common/buildcraft/builders/ItemConstructionMarker.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.core.Position; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; public class ItemConstructionMarker extends ItemBlock { diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index 6482747d..8aecdf03 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -34,15 +34,15 @@ import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IBoxProvider; import buildcraft.core.LaserData; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.blueprints.BlueprintReadConfiguration; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.lib.utils.Utils; public class TileArchitect extends TileBuildCraft implements IInventory, IBoxProvider, ICommandReceiver { diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index 6e408555..e481faa4 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -26,14 +26,13 @@ import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.core.blueprints.BlueprintId; import buildcraft.core.blueprints.BlueprintId.Kind; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.blueprints.BlueprintBase; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; /** * In this implementation, the blueprint library is the interface to the diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index cd40b94f..f4d24d84 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -54,18 +54,18 @@ import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.builders.TileAbstractBuilder; -import buildcraft.core.fluids.Tank; -import buildcraft.core.fluids.TankManager; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.fluids.TankManager; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.api.robots.ResourceIdRequest; public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable { diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java index 73a18749..d51968af 100755 --- a/common/buildcraft/builders/TileConstructionMarker.java +++ b/common/buildcraft/builders/TileConstructionMarker.java @@ -28,7 +28,7 @@ import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IBoxProvider; import buildcraft.core.LaserData; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptBuilderBase; @@ -36,11 +36,11 @@ import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.blueprints.BptContext; import buildcraft.core.builders.BuildingItem; import buildcraft.core.builders.IBuildingItemsProvider; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; public class TileConstructionMarker extends TileBuildCraft implements IBuildingItemsProvider, IBoxProvider, ICommandReceiver { diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 95e6c044..e90fcc9b 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -33,12 +33,12 @@ import buildcraft.core.blueprints.BptContext; import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.builders.patterns.PatternFill; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.lib.utils.Utils; public class TileFiller extends TileAbstractBuilder implements IHasWork, IControllable, ICommandReceiver, IStatementContainer { diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index a59baad5..bbf4722f 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -20,11 +20,11 @@ import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; import buildcraft.core.DefaultProps; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.LaserKind; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class TileMarker extends TileBuildCraft implements IAreaProvider { public static class TileWrapper implements ISerializable { diff --git a/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java b/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java index 6f7e5dd5..a4edd2cd 100644 --- a/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java +++ b/common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java @@ -22,7 +22,7 @@ import buildcraft.builders.ItemBlueprintTemplate; import buildcraft.builders.TileArchitect; import buildcraft.builders.TileBuilder; import buildcraft.builders.TileConstructionMarker; -import buildcraft.core.utils.BlockScanner; +import buildcraft.core.lib.utils.BlockScanner; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptContext; diff --git a/common/buildcraft/builders/gui/ContainerArchitect.java b/common/buildcraft/builders/gui/ContainerArchitect.java index 1f1060e6..25928e61 100644 --- a/common/buildcraft/builders/gui/ContainerArchitect.java +++ b/common/buildcraft/builders/gui/ContainerArchitect.java @@ -14,8 +14,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import buildcraft.builders.TileArchitect; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; public class ContainerArchitect extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java index bd0b2566..a3a0ae9d 100644 --- a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java @@ -14,8 +14,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import buildcraft.builders.TileBlueprintLibrary; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; public class ContainerBlueprintLibrary extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerBuilder.java b/common/buildcraft/builders/gui/ContainerBuilder.java index a2da6c01..a7a72b06 100644 --- a/common/buildcraft/builders/gui/ContainerBuilder.java +++ b/common/buildcraft/builders/gui/ContainerBuilder.java @@ -14,7 +14,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import buildcraft.builders.TileBuilder; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; public class ContainerBuilder extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/ContainerFiller.java b/common/buildcraft/builders/gui/ContainerFiller.java index 3b717a66..239e0328 100644 --- a/common/buildcraft/builders/gui/ContainerFiller.java +++ b/common/buildcraft/builders/gui/ContainerFiller.java @@ -17,9 +17,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.builders.TileFiller; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.widgets.Widget; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.widgets.Widget; public class ContainerFiller extends BuildCraftContainer { diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index 33ba088f..9a2b72d4 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -23,15 +23,14 @@ import buildcraft.BuildCraftCore; import buildcraft.builders.TileArchitect; import buildcraft.core.DefaultProps; import buildcraft.core.blueprints.BlueprintReadConfiguration; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.buttons.GuiBetterButton; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.buttons.GuiBetterButton; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.lib.utils.StringUtils; public class GuiArchitect extends GuiBuildCraft { diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index ec6702d5..dd13a507 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -19,8 +19,8 @@ import buildcraft.builders.TileBlueprintLibrary; import buildcraft.core.blueprints.BlueprintId; import buildcraft.core.blueprints.BlueprintId.Kind; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; public class GuiBlueprintLibrary extends GuiBuildCraft { diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index 816a1fce..b9647ef2 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -23,13 +23,13 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.builders.TileBuilder; import buildcraft.core.DefaultProps; -import buildcraft.core.fluids.Tank; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.ItemSlot; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.ItemSlot; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.StringUtils; public class GuiBuilder extends GuiAdvancedInterface { private static final ResourceLocation BLUEPRINT_TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/builder_blueprint.png"); diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 33f68a37..94f0cd84 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -19,14 +19,14 @@ import buildcraft.api.statements.StatementMouseClick; import buildcraft.builders.TileFiller; import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.GuiTools; -import buildcraft.core.gui.StatementParameterSlot; -import buildcraft.core.gui.StatementSlot; -import buildcraft.core.gui.buttons.GuiBetterButton; -import buildcraft.core.gui.buttons.StandardButtonTextureSets; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.GuiTools; +import buildcraft.core.lib.gui.StatementParameterSlot; +import buildcraft.core.lib.gui.StatementSlot; +import buildcraft.core.lib.gui.buttons.GuiBetterButton; +import buildcraft.core.lib.gui.buttons.StandardButtonTextureSets; +import buildcraft.core.lib.utils.StringUtils; public class GuiFiller extends GuiAdvancedInterface { class FillerParameterSlot extends StatementParameterSlot { diff --git a/common/buildcraft/builders/gui/SlotArchitect.java b/common/buildcraft/builders/gui/SlotArchitect.java index 89ea2efb..ed4f15f0 100644 --- a/common/buildcraft/builders/gui/SlotArchitect.java +++ b/common/buildcraft/builders/gui/SlotArchitect.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import buildcraft.builders.TileArchitect; -import buildcraft.core.gui.slots.SlotBase; +import buildcraft.core.lib.gui.slots.SlotBase; public class SlotArchitect extends SlotBase { private TileArchitect architect; diff --git a/common/buildcraft/builders/gui/SlotBlueprintLibrary.java b/common/buildcraft/builders/gui/SlotBlueprintLibrary.java index f61706bb..dc241529 100644 --- a/common/buildcraft/builders/gui/SlotBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/SlotBlueprintLibrary.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import buildcraft.builders.TileBlueprintLibrary; -import buildcraft.core.gui.slots.SlotBase; +import buildcraft.core.lib.gui.slots.SlotBase; public class SlotBlueprintLibrary extends SlotBase { private TileBlueprintLibrary library; diff --git a/common/buildcraft/builders/urbanism/BlockUrbanist.java b/common/buildcraft/builders/urbanism/BlockUrbanist.java index ff706ee9..915747a4 100755 --- a/common/buildcraft/builders/urbanism/BlockUrbanist.java +++ b/common/buildcraft/builders/urbanism/BlockUrbanist.java @@ -20,7 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftBuilders; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; public class BlockUrbanist extends BlockBuildCraft { diff --git a/common/buildcraft/builders/urbanism/ContainerUrbanist.java b/common/buildcraft/builders/urbanism/ContainerUrbanist.java index 4e64e845..804149e5 100755 --- a/common/buildcraft/builders/urbanism/ContainerUrbanist.java +++ b/common/buildcraft/builders/urbanism/ContainerUrbanist.java @@ -11,7 +11,7 @@ package buildcraft.builders.urbanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; public class ContainerUrbanist extends BuildCraftContainer { diff --git a/common/buildcraft/builders/urbanism/GuiUrbanist.java b/common/buildcraft/builders/urbanism/GuiUrbanist.java index a27863d8..f3cbde8c 100755 --- a/common/buildcraft/builders/urbanism/GuiUrbanist.java +++ b/common/buildcraft/builders/urbanism/GuiUrbanist.java @@ -19,8 +19,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; public class GuiUrbanist extends GuiAdvancedInterface { diff --git a/common/buildcraft/builders/urbanism/TileUrbanist.java b/common/buildcraft/builders/urbanism/TileUrbanist.java index 799d3383..af5a55d7 100755 --- a/common/buildcraft/builders/urbanism/TileUrbanist.java +++ b/common/buildcraft/builders/urbanism/TileUrbanist.java @@ -27,12 +27,12 @@ import buildcraft.BuildCraftCore; import buildcraft.core.Box; import buildcraft.core.Box.Kind; import buildcraft.core.IBoxesProvider; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; public class TileUrbanist extends TileBuildCraft implements IInventory, IBoxesProvider, ICommandReceiver { diff --git a/common/buildcraft/builders/urbanism/UrbanistTool.java b/common/buildcraft/builders/urbanism/UrbanistTool.java index 174d014a..e7b05e00 100755 --- a/common/buildcraft/builders/urbanism/UrbanistTool.java +++ b/common/buildcraft/builders/urbanism/UrbanistTool.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; -import buildcraft.core.gui.AdvancedSlot; +import buildcraft.core.lib.gui.AdvancedSlot; class UrbanistTool { public IIcon getIcon() { diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index 304608da..a62e79d0 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -23,8 +23,8 @@ import buildcraft.api.filler.IFillerPattern; import buildcraft.core.Box; import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; class UrbanistToolFiller extends UrbanistToolArea { diff --git a/common/buildcraft/core/BlockEngine.java b/common/buildcraft/core/BlockEngine.java new file mode 100644 index 00000000..d59c406a --- /dev/null +++ b/common/buildcraft/core/BlockEngine.java @@ -0,0 +1,56 @@ +package buildcraft.core; + +import java.util.ArrayList; +import java.util.List; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import buildcraft.core.lib.engines.BlockEngineBase; +import buildcraft.core.lib.engines.TileEngineBase; + +public class BlockEngine extends BlockEngineBase { + private final ArrayList> engineTiles; + private final ArrayList names; + + public BlockEngine() { + super(); + setBlockName("engineBlock"); + + engineTiles = new ArrayList>(16); + names = new ArrayList(16); + } + + @Override + public String getUnlocalizedName(int metadata) { + return names.get(metadata % names.size()); + } + + public void registerTile(Class engineTile, String name) { + engineTiles.add(engineTile); + names.add(name); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + try { + return engineTiles.get(metadata % engineTiles.size()).newInstance(); + } catch(Exception e) { + e.printStackTrace(); + return null; + } + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { + for (int i = 0; i < engineTiles.size(); i++) { + itemList.add(new ItemStack(this, 1, i)); + } + } + + public int getEngineCount() { + return engineTiles.size(); + } +} diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index a8515b89..39e16613 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -23,7 +23,7 @@ import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.IBox; import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class Box implements IBox, ISerializable { public enum Kind { diff --git a/common/buildcraft/core/CoreGuiHandler.java b/common/buildcraft/core/CoreGuiHandler.java index e1f622d9..48104c97 100755 --- a/common/buildcraft/core/CoreGuiHandler.java +++ b/common/buildcraft/core/CoreGuiHandler.java @@ -13,8 +13,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; -import buildcraft.core.gui.ContainerList; -import buildcraft.core.gui.GuiList; +import buildcraft.core.lib.gui.ContainerList; +import buildcraft.core.lib.gui.GuiList; public class CoreGuiHandler implements IGuiHandler { diff --git a/common/buildcraft/core/ItemGear.java b/common/buildcraft/core/ItemGear.java index 1f16a689..d6564085 100755 --- a/common/buildcraft/core/ItemGear.java +++ b/common/buildcraft/core/ItemGear.java @@ -8,6 +8,8 @@ */ package buildcraft.core; +import buildcraft.core.lib.items.ItemBuildCraft; + public class ItemGear extends ItemBuildCraft { public ItemGear() { diff --git a/common/buildcraft/core/ItemList.java b/common/buildcraft/core/ItemList.java index eaa5393e..0d791871 100644 --- a/common/buildcraft/core/ItemList.java +++ b/common/buildcraft/core/ItemList.java @@ -31,8 +31,9 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.BuildCraftCore; import buildcraft.api.items.IList; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.NBTUtils; public class ItemList extends ItemBuildCraft implements IList { diff --git a/common/buildcraft/core/ItemMapLocation.java b/common/buildcraft/core/ItemMapLocation.java index da022507..86fdbefe 100755 --- a/common/buildcraft/core/ItemMapLocation.java +++ b/common/buildcraft/core/ItemMapLocation.java @@ -33,8 +33,9 @@ import buildcraft.api.core.IBox; import buildcraft.api.core.IPathProvider; import buildcraft.api.core.IZone; import buildcraft.api.items.IMapLocation; -import buildcraft.core.utils.NBTUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.NBTUtils; +import buildcraft.core.lib.utils.StringUtils; public class ItemMapLocation extends ItemBuildCraft implements IMapLocation { diff --git a/common/buildcraft/core/ItemSpring.java b/common/buildcraft/core/ItemSpring.java index f187c7ff..2c5da5a7 100644 --- a/common/buildcraft/core/ItemSpring.java +++ b/common/buildcraft/core/ItemSpring.java @@ -12,6 +12,7 @@ import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import buildcraft.core.lib.items.ItemBlockBuildCraft; public class ItemSpring extends ItemBlockBuildCraft { diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java index 17bf0dbf..c3e9f803 100644 --- a/common/buildcraft/core/ItemWrench.java +++ b/common/buildcraft/core/ItemWrench.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemWrench extends ItemBuildCraft implements IToolWrench { diff --git a/common/buildcraft/energy/SchematicEngine.java b/common/buildcraft/core/SchematicEngine.java similarity index 85% rename from common/buildcraft/energy/SchematicEngine.java rename to common/buildcraft/core/SchematicEngine.java index b123b17c..56fcdf4c 100644 --- a/common/buildcraft/energy/SchematicEngine.java +++ b/common/buildcraft/core/SchematicEngine.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core; import java.util.LinkedList; @@ -16,6 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; +import buildcraft.core.lib.engines.TileEngineBase; public class SchematicEngine extends SchematicTile { @@ -32,7 +33,7 @@ public class SchematicEngine extends SchematicTile { public void initializeFromObjectAt(IBuilderContext context, int x, int y, int z) { super.initializeFromObjectAt(context, x, y, z); - TileEngine engine = (TileEngine) context.world().getTileEntity(x, y, z); + TileEngineBase engine = (TileEngineBase) context.world().getTileEntity(x, y, z); tileNBT.setInteger("orientation", engine.orientation.ordinal()); tileNBT.removeTag("progress"); @@ -46,7 +47,7 @@ public class SchematicEngine extends SchematicTile { public void placeInWorld(IBuilderContext context, int x, int y, int z, LinkedList stacks) { super.placeInWorld(context, x, y, z, stacks); - TileEngine engine = (TileEngine) context.world().getTileEntity(x, y, z); + TileEngineBase engine = (TileEngineBase) context.world().getTileEntity(x, y, z); engine.orientation = ForgeDirection.getOrientation(tileNBT.getInteger("orientation")); engine.sendNetworkUpdate(); @@ -54,7 +55,7 @@ public class SchematicEngine extends SchematicTile { @Override public void postProcessing (IBuilderContext context, int x, int y, int z) { - TileEngine engine = (TileEngine) context.world().getTileEntity(x, y, z); + TileEngineBase engine = (TileEngineBase) context.world().getTileEntity(x, y, z); if (engine != null) { engine.orientation = ForgeDirection.getOrientation(tileNBT.getInteger("orientation")); diff --git a/common/buildcraft/core/StackAtPosition.java b/common/buildcraft/core/StackAtPosition.java index 93500899..d6f15da6 100755 --- a/common/buildcraft/core/StackAtPosition.java +++ b/common/buildcraft/core/StackAtPosition.java @@ -14,8 +14,7 @@ import net.minecraft.item.ItemStack; import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.NetworkUtils; public class StackAtPosition implements ISerializable { public ItemStack stack; diff --git a/common/buildcraft/core/TileEngine.java b/common/buildcraft/core/TileEngine.java new file mode 100644 index 00000000..be0cf387 --- /dev/null +++ b/common/buildcraft/core/TileEngine.java @@ -0,0 +1,32 @@ +package buildcraft.core; + +import net.minecraft.util.ResourceLocation; +import buildcraft.core.lib.engines.TileEngineBase; + +/** + * Created by asie on 3/6/15. + */ +public abstract class TileEngine extends TileEngineBase { + // Index corresponds to metadata + public static final ResourceLocation[] BASE_TEXTURES = new ResourceLocation[]{ + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_wood.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_stone.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_iron.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_creative.png") + }; + + public static final ResourceLocation[] CHAMBER_TEXTURES = new ResourceLocation[]{ + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_wood.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_stone.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_iron.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_creative.png") + }; + + // THESE ARE ONLY BLUE TRUNKS. OTHER HEAT STAGES ARE HANDLED PER TILE + public static final ResourceLocation[] TRUNK_TEXTURES = new ResourceLocation[]{ + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"), + new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_creative.png") + }; +} diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/core/TileEngineWood.java similarity index 97% rename from common/buildcraft/energy/TileEngineWood.java rename to common/buildcraft/core/TileEngineWood.java index 204065fa..cd189cac 100644 --- a/common/buildcraft/energy/TileEngineWood.java +++ b/common/buildcraft/core/TileEngineWood.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -16,6 +16,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IRedstoneEngine; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.transport.IPipeTile; +import buildcraft.core.lib.engines.TileEngineBase; public class TileEngineWood extends TileEngine implements IRedstoneEngine { diff --git a/common/buildcraft/core/ZoneChunk.java b/common/buildcraft/core/ZoneChunk.java index 1b56a462..75241d1b 100755 --- a/common/buildcraft/core/ZoneChunk.java +++ b/common/buildcraft/core/ZoneChunk.java @@ -17,9 +17,8 @@ import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.ISerializable; -import buildcraft.core.utils.BitSetUtils; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.BitSetUtils; +import buildcraft.core.lib.utils.NetworkUtils; public class ZoneChunk implements ISerializable { diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index 491316ec..8f4301aa 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -28,7 +28,7 @@ import buildcraft.api.blueprints.SchematicEntity; import buildcraft.api.blueprints.Translation; import buildcraft.api.core.BCLog; import buildcraft.core.blueprints.BlueprintId.Kind; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; public class Blueprint extends BlueprintBase { public LinkedList entities = new LinkedList(); diff --git a/common/buildcraft/core/blueprints/BlueprintId.java b/common/buildcraft/core/blueprints/BlueprintId.java index af52704f..7819da24 100644 --- a/common/buildcraft/core/blueprints/BlueprintId.java +++ b/common/buildcraft/core/blueprints/BlueprintId.java @@ -20,8 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import buildcraft.BuildCraftBuilders; import buildcraft.api.core.ISerializable; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.NetworkUtils; public final class BlueprintId implements Comparable, ISerializable { public enum Kind { diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index a89d8a03..c7195210 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -46,7 +46,7 @@ import buildcraft.core.builders.BuildingSlotBlock; import buildcraft.core.builders.IBuildingItemsProvider; import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.utils.BlockUtils; public abstract class BptBuilderBase implements IAreaProvider { diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 4e56e384..e350cb26 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -50,10 +50,10 @@ import buildcraft.core.builders.BuildingSlotEntity; import buildcraft.core.builders.BuildingSlotIterator; import buildcraft.core.builders.IBuildingItemsProvider; import buildcraft.core.builders.TileAbstractBuilder; -import buildcraft.core.inventory.InventoryCopy; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.inventory.InventoryCopy; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.utils.BlockUtils; public class BptBuilderBlueprint extends BptBuilderBase { diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index 81adbba3..bfa633a6 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -25,8 +25,8 @@ import buildcraft.core.builders.BuildingSlotBlock; import buildcraft.core.builders.BuildingSlotBlock.Mode; import buildcraft.core.builders.BuildingSlotIterator; import buildcraft.core.builders.TileAbstractBuilder; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.utils.BlockUtils; public class BptBuilderTemplate extends BptBuilderBase { diff --git a/common/buildcraft/core/blueprints/Template.java b/common/buildcraft/core/blueprints/Template.java index 8ee6bbe0..3b60a4a7 100644 --- a/common/buildcraft/core/blueprints/Template.java +++ b/common/buildcraft/core/blueprints/Template.java @@ -17,7 +17,7 @@ import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.core.BuildCraftAPI; import buildcraft.core.blueprints.BlueprintId.Kind; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; /** * Use the template system to describe fillers diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index b0a168ef..f868d63e 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -29,7 +29,7 @@ import buildcraft.api.blueprints.SchematicFactory; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; public class BuildingSlotBlock extends BuildingSlot { diff --git a/common/buildcraft/core/builders/TileAbstractBuilder.java b/common/buildcraft/core/builders/TileAbstractBuilder.java index 9eb54526..e0c9ac72 100755 --- a/common/buildcraft/core/builders/TileAbstractBuilder.java +++ b/common/buildcraft/core/builders/TileAbstractBuilder.java @@ -24,12 +24,12 @@ import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.ITileBuilder; import buildcraft.core.IBoxProvider; import buildcraft.core.LaserData; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; public abstract class TileAbstractBuilder extends TileBuildCraft implements ITileBuilder, IInventory, IBoxProvider, IBuildingItemsProvider, ICommandReceiver { diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index 8c88da82..74d8f50d 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -26,7 +26,7 @@ import buildcraft.core.blueprints.BlueprintBase; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.SchematicRegistry; import buildcraft.core.blueprints.Template; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public abstract class FillerPattern implements IFillerPattern { diff --git a/common/buildcraft/core/builders/patterns/PatternParameterYDir.java b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java index 9e278608..c5101097 100644 --- a/common/buildcraft/core/builders/patterns/PatternParameterYDir.java +++ b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java @@ -8,7 +8,7 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class PatternParameterYDir implements IStatementParameter { private static IIcon iconUp, iconDown; diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/lib/EntityBlock.java similarity index 98% rename from common/buildcraft/core/EntityBlock.java rename to common/buildcraft/core/lib/EntityBlock.java index 47e948c0..2c766044 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/lib/EntityBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/ITileBufferHolder.java b/common/buildcraft/core/lib/ITileBufferHolder.java similarity index 95% rename from common/buildcraft/core/ITileBufferHolder.java rename to common/buildcraft/core/lib/ITileBufferHolder.java index b79f992e..84782563 100644 --- a/common/buildcraft/core/ITileBufferHolder.java +++ b/common/buildcraft/core/lib/ITileBufferHolder.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/RFBattery.java b/common/buildcraft/core/lib/RFBattery.java similarity index 98% rename from common/buildcraft/core/RFBattery.java rename to common/buildcraft/core/lib/RFBattery.java index f8c21ea0..6d842e74 100644 --- a/common/buildcraft/core/RFBattery.java +++ b/common/buildcraft/core/lib/RFBattery.java @@ -1,4 +1,4 @@ -package buildcraft.core; +package buildcraft.core.lib; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/lib/TileBuffer.java similarity index 96% rename from common/buildcraft/core/TileBuffer.java rename to common/buildcraft/core/lib/TileBuffer.java index 12f0e24c..5db21e0e 100644 --- a/common/buildcraft/core/TileBuffer.java +++ b/common/buildcraft/core/lib/TileBuffer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; @@ -15,7 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.SafeTimeTracker; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.utils.BlockUtils; public final class TileBuffer { diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/lib/block/BlockBuildCraft.java similarity index 95% rename from common/buildcraft/core/BlockBuildCraft.java rename to common/buildcraft/core/lib/block/BlockBuildCraft.java index 506a4fc5..d2fc7f8b 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/lib/block/BlockBuildCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.block; import java.util.Random; @@ -25,7 +25,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import buildcraft.api.events.BlockPlacedDownEvent; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.utils.Utils; +import buildcraft.core.BCCreativeTab; +import buildcraft.core.lib.utils.Utils; public abstract class BlockBuildCraft extends BlockContainer { diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/lib/block/TileBuildCraft.java similarity index 94% rename from common/buildcraft/core/TileBuildCraft.java rename to common/buildcraft/core/lib/block/TileBuildCraft.java index ca3fc72e..db4ecbe9 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/lib/block/TileBuildCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.block; import java.util.HashSet; @@ -26,10 +26,12 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftCore; import buildcraft.api.core.ISerializable; import buildcraft.api.tiles.IControllable; -import buildcraft.core.network.Packet; -import buildcraft.core.network.ISynchronizedTile; -import buildcraft.core.network.PacketTileUpdate; -import buildcraft.core.utils.Utils; +import buildcraft.core.DefaultProps; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.PacketTileUpdate; +import buildcraft.core.lib.utils.Utils; /** * For future maintainers: This class intentionally does not implement @@ -37,7 +39,7 @@ import buildcraft.core.utils.Utils; * we expect the tiles supporting it to implement it - but TileBuildCraft * provides all the underlying functionality to stop code repetition. */ -public abstract class TileBuildCraft extends TileEntity implements IEnergyHandler, ISynchronizedTile, ISerializable { +public abstract class TileBuildCraft extends TileEntity implements IEnergyHandler, ISerializable { protected TileBuffer[] cache; protected HashSet guiWatchers = new HashSet(); protected IControllable.Mode mode; diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/core/lib/engines/BlockEngineBase.java similarity index 67% rename from common/buildcraft/energy/BlockEngine.java rename to common/buildcraft/core/lib/engines/BlockEngineBase.java index 88b2eeb5..55dee992 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/core/lib/engines/BlockEngineBase.java @@ -6,41 +6,33 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core.lib.engines; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; -import buildcraft.core.ICustomHighlight; +import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.render.ICustomHighlight; import buildcraft.core.IItemPipe; -public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { - +public abstract class BlockEngineBase extends BlockBuildCraft implements ICustomHighlight { private static final AxisAlignedBB[][] boxes = { {AxisAlignedBB.getBoundingBox(0.0, 0.5, 0.0, 1.0, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.0, 0.25, 0.75, 0.5, 0.75)}, // -Y {AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 0.5, 1.0), AxisAlignedBB.getBoundingBox(0.25, 0.5, 0.25, 0.75, 1.0, 0.75)}, // +Y @@ -50,13 +42,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { {AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 0.5, 1.0, 1.0), AxisAlignedBB.getBoundingBox(0.5, 0.25, 0.25, 1.0, 0.75, 0.75)} // +X }; - private static IIcon woodTexture; - private static IIcon stoneTexture; - private static IIcon ironTexture; - - public BlockEngine() { + public BlockEngineBase() { super(Material.iron); - setBlockName("engineBlock"); } @Override @@ -69,41 +56,17 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { return false; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - woodTexture = par1IconRegister.registerIcon("buildcraft:engineWoodBottom"); - stoneTexture = par1IconRegister.registerIcon("buildcraft:engineStoneBottom"); - ironTexture = par1IconRegister.registerIcon("buildcraft:engineIronBottom"); - } - @Override public int getRenderType() { return BuildCraftCore.blockByEntityModel; } - @Override - public TileEntity createTileEntity(World world, int metadata) { - switch (metadata) { - case 0: - return new TileEngineWood(); - case 1: - return new TileEngineStone(); - case 2: - return new TileEngineIron(); - case 3: - return new TileEngineCreative(); - default: - return new TileEngineWood(); - } - } - @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - return ((TileEngine) tile).orientation.getOpposite() == side; + if (tile instanceof TileEngineBase) { + return ((TileEngineBase) tile).orientation.getOpposite() == side; } else { return false; } @@ -113,8 +76,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - return ((TileEngine) tile).switchOrientation(false); + if (tile instanceof TileEngineBase) { + return ((TileEngineBase) tile).switchOrientation(false); } else { return false; } @@ -122,15 +85,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int side, float par7, float par8, float par9) { - TileEntity tile = world.getTileEntity(i, j, k); - // REMOVED DUE TO CREATIVE ENGINE REQUIREMENTS - dmillerw - // Drop through if the player is sneaking -// if (player.isSneaking()) { -// return false; -// } - BlockInteractionEvent event = new BlockInteractionEvent(player, this, world.getBlockMetadata(i, j, k)); FMLCommonHandler.instance().bus().post(event); if (event.isCanceled()) { @@ -144,8 +100,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { } } - if (tile instanceof TileEngine) { - return ((TileEngine) tile).onBlockActivated(player, ForgeDirection.getOrientation(side)); + if (tile instanceof TileEngineBase) { + return ((TileEngineBase) tile).onBlockActivated(player, ForgeDirection.getOrientation(side)); } return false; @@ -155,8 +111,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { @SuppressWarnings("unchecked") public void addCollisionBoxesToList(World wrd, int x, int y, int z, AxisAlignedBB mask, List list, Entity ent) { TileEntity tile = wrd.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - AxisAlignedBB[] aabbs = boxes[((TileEngine) tile).orientation.ordinal()]; + if (tile instanceof TileEngineBase) { + AxisAlignedBB[] aabbs = boxes[((TileEngineBase) tile).orientation.ordinal()]; for (AxisAlignedBB aabb : aabbs) { AxisAlignedBB aabbTmp = aabb.getOffsetBoundingBox(x, y, z); if (mask.intersectsWith(aabbTmp)) { @@ -171,8 +127,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { @Override public AxisAlignedBB[] getBoxes(World wrd, int x, int y, int z, EntityPlayer player) { TileEntity tile = wrd.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - return boxes[((TileEngine) tile).orientation.ordinal()]; + if (tile instanceof TileEngineBase) { + return boxes[((TileEngineBase) tile).orientation.ordinal()]; } else { return new AxisAlignedBB[]{AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 1.0, 1.0)}; } @@ -186,8 +142,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { @Override public MovingObjectPosition collisionRayTrace(World wrd, int x, int y, int z, Vec3 origin, Vec3 direction) { TileEntity tile = wrd.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - AxisAlignedBB[] aabbs = boxes[((TileEngine) tile).orientation.ordinal()]; + if (tile instanceof TileEngineBase) { + AxisAlignedBB[] aabbs = boxes[((TileEngineBase) tile).orientation.ordinal()]; MovingObjectPosition closest = null; for (AxisAlignedBB aabb : aabbs) { MovingObjectPosition mop = aabb.getOffsetBoundingBox(x, y, z).calculateIntercept(origin, direction); @@ -213,8 +169,8 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { @Override public void onPostBlockPlaced(World world, int x, int y, int z, int par5) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - TileEngine engine = (TileEngine) tile; + if (tile instanceof TileEngineBase) { + TileEngineBase engine = (TileEngineBase) tile; engine.orientation = ForgeDirection.UP; if (!engine.isOrientationValid()) { engine.switchOrientation(true); @@ -232,11 +188,11 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { public void randomDisplayTick(World world, int i, int j, int k, Random random) { TileEntity tile = world.getTileEntity(i, j, k); - if (!(tile instanceof TileEngine)) { + if (!(tile instanceof TileEngineBase)) { return; } - if (((TileEngine) tile).getEnergyStage() == TileEngine.EnergyStage.OVERHEAT) { + if (((TileEngineBase) tile).getEnergyStage() == TileEngineBase.EnergyStage.OVERHEAT) { for (int f = 0; f < 16; f++) { world.spawnParticle("smoke", i + 0.4F + (random.nextFloat() * 0.2F), j + (random.nextFloat() * 0.5F), @@ -245,7 +201,7 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { random.nextFloat() * 0.05F + 0.02F, random.nextFloat() * 0.04F - 0.02F); } - } else if (((TileEngine) tile).isBurning()) { + } else if (((TileEngineBase) tile).isBurning()) { float f = i + 0.5F; float f1 = j + 0.0F + (random.nextFloat() * 6F) / 16F; float f2 = k + 0.5F; @@ -259,36 +215,12 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { } } - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { - itemList.add(new ItemStack(this, 1, 0)); // WOOD - itemList.add(new ItemStack(this, 1, 1)); // STONE - itemList.add(new ItemStack(this, 1, 2)); // IRON - itemList.add(new ItemStack(this, 1, 3)); // CREATIVE - } - @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block block) { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileEngine) { - ((TileEngine) tile).onNeighborUpdate(); - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (meta) { - case 0: - return woodTexture; - case 1: - return stoneTexture; - case 2: - return ironTexture; - default: - return null; + if (tile instanceof TileEngineBase) { + ((TileEngineBase) tile).onNeighborUpdate(); } } @@ -296,4 +228,7 @@ public class BlockEngine extends BlockBuildCraft implements ICustomHighlight { public TileEntity createNewTileEntity(World world, int metadata) { return null; } + + public abstract String getUnlocalizedName(int metadata); + public abstract TileEntity createTileEntity(World world, int metadata); } diff --git a/common/buildcraft/energy/ItemEngine.java b/common/buildcraft/core/lib/engines/ItemEngine.java similarity index 69% rename from common/buildcraft/energy/ItemEngine.java rename to common/buildcraft/core/lib/engines/ItemEngine.java index 35927267..ebf040ec 100644 --- a/common/buildcraft/energy/ItemEngine.java +++ b/common/buildcraft/core/lib/engines/ItemEngine.java @@ -6,18 +6,20 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core.lib.engines; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBlockBuildCraft; +import buildcraft.core.lib.items.ItemBlockBuildCraft; public class ItemEngine extends ItemBlockBuildCraft { + private final BlockEngineBase engineBlock; public ItemEngine(Block block) { super(block); + engineBlock = (BlockEngineBase) block; setCreativeTab(BCCreativeTab.get("main")); setMaxDamage(0); setHasSubtypes(true); @@ -30,17 +32,6 @@ public class ItemEngine extends ItemBlockBuildCraft { @Override public String getUnlocalizedName(ItemStack itemstack) { - switch (itemstack.getItemDamage()) { - case 0: - return "tile.engineWood"; - case 1: - return "tile.engineStone"; - case 2: - return "tile.engineIron"; - case 3: - return "tile.engineCreative"; - default: - return "tile.engineWood"; - } + return engineBlock.getUnlocalizedName(itemstack.getItemDamage()); } } diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/core/lib/engines/RenderEngine.java similarity index 97% rename from common/buildcraft/energy/render/RenderEngine.java rename to common/buildcraft/core/lib/engines/RenderEngine.java index 761d37a9..cb742a7e 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/core/lib/engines/RenderEngine.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy.render; +package buildcraft.core.lib.engines; import org.lwjgl.opengl.GL11; @@ -21,8 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; -import buildcraft.core.IInventoryRenderer; -import buildcraft.energy.TileEngine; +import buildcraft.core.lib.render.IInventoryRenderer; public class RenderEngine extends TileEntitySpecialRenderer implements IInventoryRenderer { @@ -91,7 +90,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor @Override public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - TileEngine engine = (TileEngine) tileentity; + TileEngineBase engine = (TileEngineBase) tileentity; if (engine != null) { render(engine.progress, engine.orientation, engine.getBaseTexture(), engine.getChamberTexture(), engine.getTrunkTexture(engine.getEnergyStage()), x, y, z); diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/core/lib/engines/TileEngineBase.java similarity index 86% rename from common/buildcraft/energy/TileEngine.java rename to common/buildcraft/core/lib/engines/TileEngineBase.java index ee26711c..9448236c 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/core/lib/engines/TileEngineBase.java @@ -6,11 +6,12 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.energy; +package buildcraft.core.lib.engines; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -29,35 +30,11 @@ import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.utils.MathUtils; -import buildcraft.core.utils.Utils; -import buildcraft.energy.gui.ContainerEngine; - -public abstract class TileEngine extends TileBuildCraft implements IPipeConnection, IEnergyHandler, IEngine, IHeatable { - // Index corresponds to metadata - public static final ResourceLocation[] BASE_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_wood.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_stone.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_iron.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/base_creative.png") - }; - - public static final ResourceLocation[] CHAMBER_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_wood.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_stone.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_iron.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber_creative.png") - }; - - // THESE ARE ONLY BLUE TRUNKS. OTHER HEAT STAGES ARE HANDLED PER TILE - public static final ResourceLocation[] TRUNK_TEXTURES = new ResourceLocation[]{ - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_wood.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_stone.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_iron.png"), - new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_creative.png") - }; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.utils.MathUtils; +import buildcraft.core.lib.utils.Utils; +public abstract class TileEngineBase extends TileBuildCraft implements IPipeConnection, IEnergyHandler, IEngine, IHeatable { // TEMP public static final ResourceLocation TRUNK_BLUE_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_blue.png"); public static final ResourceLocation TRUNK_GREEN_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_green.png"); @@ -65,7 +42,7 @@ public abstract class TileEngine extends TileBuildCraft implements IPipeConnecti public static final ResourceLocation TRUNK_RED_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_red.png"); public static final ResourceLocation TRUNK_OVERHEAT_TEXTURE = new ResourceLocation(DefaultProps.TEXTURE_PATH_BLOCKS + "/trunk_overheat.png"); - public enum EnergyStage { + public enum EnergyStage { BLUE, GREEN, YELLOW, RED, OVERHEAT; public static final EnergyStage[] VALUES = values(); } @@ -82,13 +59,12 @@ public abstract class TileEngine extends TileBuildCraft implements IPipeConnecti public ForgeDirection orientation = ForgeDirection.UP; protected int progressPart = 0; - protected boolean lastPower = false; private boolean checkOrientation = false; private boolean isPumping = false; // Used for SMP synch - public TileEngine() { + public TileEngineBase() { } @Override @@ -350,11 +326,6 @@ public abstract class TileEngine extends TileBuildCraft implements IPipeConnecti } } - // Uncomment out for constant power -// public float getActualOutput() { -// float heatLevel = getIdealHeatLevel(); -// return getCurrentOutput() * heatLevel; -// } protected void burn() { } @@ -480,11 +451,11 @@ public abstract class TileEngine extends TileBuildCraft implements IPipeConnecti } } - public void sendGUINetworkData(ContainerEngine containerEngine, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(containerEngine, 0, Math.round(energy) & 0xffff); - iCrafting.sendProgressBarUpdate(containerEngine, 1, (Math.round(energy) & 0xffff0000) >> 16); - iCrafting.sendProgressBarUpdate(containerEngine, 2, Math.round(currentOutput)); - iCrafting.sendProgressBarUpdate(containerEngine, 3, Math.round(heat * 100)); + public void sendGUINetworkData(Container container, ICrafting iCrafting) { + iCrafting.sendProgressBarUpdate(container, 0, Math.round(energy) & 0xffff); + iCrafting.sendProgressBarUpdate(container, 1, (Math.round(energy) & 0xffff0000) >> 16); + iCrafting.sendProgressBarUpdate(container, 2, Math.round(currentOutput)); + iCrafting.sendProgressBarUpdate(container, 3, Math.round(heat * 100)); } /* STATE INFORMATION */ diff --git a/common/buildcraft/core/fluids/RestrictedTank.java b/common/buildcraft/core/lib/fluids/RestrictedTank.java similarity index 96% rename from common/buildcraft/core/fluids/RestrictedTank.java rename to common/buildcraft/core/lib/fluids/RestrictedTank.java index 1d1d7c2c..c27b97d0 100644 --- a/common/buildcraft/core/fluids/RestrictedTank.java +++ b/common/buildcraft/core/lib/fluids/RestrictedTank.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.fluids; +package buildcraft.core.lib.fluids; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/fluids/SingleUseTank.java b/common/buildcraft/core/lib/fluids/SingleUseTank.java similarity index 97% rename from common/buildcraft/core/fluids/SingleUseTank.java rename to common/buildcraft/core/lib/fluids/SingleUseTank.java index 7faa23ca..f00371a2 100644 --- a/common/buildcraft/core/fluids/SingleUseTank.java +++ b/common/buildcraft/core/lib/fluids/SingleUseTank.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.fluids; +package buildcraft.core.lib.fluids; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/fluids/Tank.java b/common/buildcraft/core/lib/fluids/Tank.java similarity index 94% rename from common/buildcraft/core/fluids/Tank.java rename to common/buildcraft/core/lib/fluids/Tank.java index d9904174..535bf2bf 100644 --- a/common/buildcraft/core/fluids/Tank.java +++ b/common/buildcraft/core/lib/fluids/Tank.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.fluids; +package buildcraft.core.lib.fluids; import java.util.Locale; @@ -16,8 +16,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; public class Tank extends FluidTank { public int colorRenderCache = 0xFFFFFF; diff --git a/common/buildcraft/core/fluids/TankManager.java b/common/buildcraft/core/lib/fluids/TankManager.java similarity index 98% rename from common/buildcraft/core/fluids/TankManager.java rename to common/buildcraft/core/lib/fluids/TankManager.java index ad5d69cd..434b7a5d 100644 --- a/common/buildcraft/core/fluids/TankManager.java +++ b/common/buildcraft/core/lib/fluids/TankManager.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.fluids; +package buildcraft.core.lib.fluids; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/buildcraft/core/fluids/TankUtils.java b/common/buildcraft/core/lib/fluids/TankUtils.java similarity index 96% rename from common/buildcraft/core/fluids/TankUtils.java rename to common/buildcraft/core/lib/fluids/TankUtils.java index db675cef..7d7cfd6f 100644 --- a/common/buildcraft/core/fluids/TankUtils.java +++ b/common/buildcraft/core/lib/fluids/TankUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.fluids; +package buildcraft.core.lib.fluids; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -22,8 +22,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; -import buildcraft.core.TileBuffer; -import buildcraft.core.inventory.InvUtils; +import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.inventory.InvUtils; public final class TankUtils { diff --git a/common/buildcraft/core/gui/AdvancedSlot.java b/common/buildcraft/core/lib/gui/AdvancedSlot.java similarity index 98% rename from common/buildcraft/core/gui/AdvancedSlot.java rename to common/buildcraft/core/lib/gui/AdvancedSlot.java index d24cbc72..513a2af1 100755 --- a/common/buildcraft/core/gui/AdvancedSlot.java +++ b/common/buildcraft/core/lib/gui/AdvancedSlot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/gui/BuildCraftContainer.java b/common/buildcraft/core/lib/gui/BuildCraftContainer.java similarity index 96% rename from common/buildcraft/core/gui/BuildCraftContainer.java rename to common/buildcraft/core/lib/gui/BuildCraftContainer.java index 870d223e..1a4e005a 100644 --- a/common/buildcraft/core/gui/BuildCraftContainer.java +++ b/common/buildcraft/core/lib/gui/BuildCraftContainer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import java.io.DataInputStream; import java.io.IOException; @@ -25,11 +25,11 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftCore; -import buildcraft.core.gui.slots.IPhantomSlot; -import buildcraft.core.gui.slots.SlotBase; -import buildcraft.core.gui.widgets.Widget; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.network.PacketGuiWidget; +import buildcraft.core.lib.gui.slots.IPhantomSlot; +import buildcraft.core.lib.gui.slots.SlotBase; +import buildcraft.core.lib.gui.widgets.Widget; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.network.PacketGuiWidget; public abstract class BuildCraftContainer extends Container { diff --git a/common/buildcraft/core/gui/ContainerList.java b/common/buildcraft/core/lib/gui/ContainerList.java similarity index 92% rename from common/buildcraft/core/gui/ContainerList.java rename to common/buildcraft/core/lib/gui/ContainerList.java index 25a4ef99..86a3427d 100755 --- a/common/buildcraft/core/gui/ContainerList.java +++ b/common/buildcraft/core/lib/gui/ContainerList.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import io.netty.buffer.ByteBuf; @@ -18,11 +18,10 @@ import cpw.mods.fml.relauncher.Side; import buildcraft.BuildCraftCore; import buildcraft.core.ItemList; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; public class ContainerList extends BuildCraftContainer implements ICommandReceiver { diff --git a/common/buildcraft/core/gui/FluidSlot.java b/common/buildcraft/core/lib/gui/FluidSlot.java similarity index 89% rename from common/buildcraft/core/gui/FluidSlot.java rename to common/buildcraft/core/lib/gui/FluidSlot.java index 2b568cc6..859c9c1e 100755 --- a/common/buildcraft/core/gui/FluidSlot.java +++ b/common/buildcraft/core/lib/gui/FluidSlot.java @@ -6,15 +6,15 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; -import buildcraft.core.render.FluidRenderer; -import buildcraft.core.render.RenderUtils; +import buildcraft.core.lib.render.FluidRenderer; +import buildcraft.core.lib.render.RenderUtils; /** * For the refinery, a kind of phantom slot for fluid. diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java similarity index 99% rename from common/buildcraft/core/gui/GuiAdvancedInterface.java rename to common/buildcraft/core/lib/gui/GuiAdvancedInterface.java index 6ab8f2f3..ee1a0e89 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/lib/gui/GuiAdvancedInterface.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import java.util.ArrayList; diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/lib/gui/GuiBuildCraft.java similarity index 97% rename from common/buildcraft/core/gui/GuiBuildCraft.java rename to common/buildcraft/core/lib/gui/GuiBuildCraft.java index 73af1e3c..e24db210 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/lib/gui/GuiBuildCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import java.util.ArrayList; import java.util.Collection; @@ -30,13 +30,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.slots.IPhantomSlot; -import buildcraft.core.gui.tooltips.IToolTipProvider; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; -import buildcraft.core.gui.widgets.Widget; -import buildcraft.core.render.RenderUtils; -import buildcraft.core.utils.SessionVars; +import buildcraft.core.lib.gui.slots.IPhantomSlot; +import buildcraft.core.lib.gui.tooltips.IToolTipProvider; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.gui.widgets.Widget; +import buildcraft.core.lib.render.RenderUtils; +import buildcraft.core.lib.utils.SessionVars; public abstract class GuiBuildCraft extends GuiContainer { diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/lib/gui/GuiList.java similarity index 99% rename from common/buildcraft/core/gui/GuiList.java rename to common/buildcraft/core/lib/gui/GuiList.java index 35522960..0e1d4627 100755 --- a/common/buildcraft/core/gui/GuiList.java +++ b/common/buildcraft/core/lib/gui/GuiList.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/buildcraft/core/gui/GuiTools.java b/common/buildcraft/core/lib/gui/GuiTools.java similarity index 95% rename from common/buildcraft/core/gui/GuiTools.java rename to common/buildcraft/core/lib/gui/GuiTools.java index 8e975f23..743101c9 100644 --- a/common/buildcraft/core/gui/GuiTools.java +++ b/common/buildcraft/core/lib/gui/GuiTools.java @@ -6,13 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import java.util.List; import net.minecraft.client.gui.FontRenderer; -import buildcraft.core.gui.buttons.GuiBetterButton; +import buildcraft.core.lib.gui.buttons.GuiBetterButton; public final class GuiTools { diff --git a/common/buildcraft/core/gui/IInventorySlot.java b/common/buildcraft/core/lib/gui/IInventorySlot.java similarity index 96% rename from common/buildcraft/core/gui/IInventorySlot.java rename to common/buildcraft/core/lib/gui/IInventorySlot.java index 9c5811dd..51f48a9b 100755 --- a/common/buildcraft/core/gui/IInventorySlot.java +++ b/common/buildcraft/core/lib/gui/IInventorySlot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/gui/ItemSlot.java b/common/buildcraft/core/lib/gui/ItemSlot.java similarity index 95% rename from common/buildcraft/core/gui/ItemSlot.java rename to common/buildcraft/core/lib/gui/ItemSlot.java index cdb6e1c7..6b422ce4 100755 --- a/common/buildcraft/core/gui/ItemSlot.java +++ b/common/buildcraft/core/lib/gui/ItemSlot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/gui/StatementParameterSlot.java b/common/buildcraft/core/lib/gui/StatementParameterSlot.java similarity index 98% rename from common/buildcraft/core/gui/StatementParameterSlot.java rename to common/buildcraft/core/lib/gui/StatementParameterSlot.java index 719c3584..850c8988 100644 --- a/common/buildcraft/core/gui/StatementParameterSlot.java +++ b/common/buildcraft/core/lib/gui/StatementParameterSlot.java @@ -1,4 +1,4 @@ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/common/buildcraft/core/gui/StatementSlot.java b/common/buildcraft/core/lib/gui/StatementSlot.java similarity index 96% rename from common/buildcraft/core/gui/StatementSlot.java rename to common/buildcraft/core/lib/gui/StatementSlot.java index 37616ade..c42d0731 100644 --- a/common/buildcraft/core/gui/StatementSlot.java +++ b/common/buildcraft/core/lib/gui/StatementSlot.java @@ -1,4 +1,4 @@ -package buildcraft.core.gui; +package buildcraft.core.lib.gui; import java.util.ArrayList; import net.minecraft.util.IIcon; diff --git a/common/buildcraft/core/gui/buttons/ButtonTextureSet.java b/common/buildcraft/core/lib/gui/buttons/ButtonTextureSet.java similarity index 94% rename from common/buildcraft/core/gui/buttons/ButtonTextureSet.java rename to common/buildcraft/core/lib/gui/buttons/ButtonTextureSet.java index 0b4dc329..1e55af13 100644 --- a/common/buildcraft/core/gui/buttons/ButtonTextureSet.java +++ b/common/buildcraft/core/lib/gui/buttons/ButtonTextureSet.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public class ButtonTextureSet implements IButtonTextureSet { diff --git a/common/buildcraft/core/gui/buttons/GuiBetterButton.java b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java similarity index 95% rename from common/buildcraft/core/gui/buttons/GuiBetterButton.java rename to common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java index 8405f743..c3d599df 100644 --- a/common/buildcraft/core/gui/buttons/GuiBetterButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import org.lwjgl.opengl.GL11; @@ -19,8 +19,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.tooltips.IToolTipProvider; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.IToolTipProvider; +import buildcraft.core.lib.gui.tooltips.ToolTip; @SideOnly(Side.CLIENT) public class GuiBetterButton extends GuiButton implements IToolTipProvider { diff --git a/common/buildcraft/core/gui/buttons/GuiButtonSmall.java b/common/buildcraft/core/lib/gui/buttons/GuiButtonSmall.java similarity index 94% rename from common/buildcraft/core/gui/buttons/GuiButtonSmall.java rename to common/buildcraft/core/lib/gui/buttons/GuiButtonSmall.java index be3d13c9..a4851cf0 100644 --- a/common/buildcraft/core/gui/buttons/GuiButtonSmall.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiButtonSmall.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/gui/buttons/GuiImageButton.java b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java similarity index 98% rename from common/buildcraft/core/gui/buttons/GuiImageButton.java rename to common/buildcraft/core/lib/gui/buttons/GuiImageButton.java index 78ae8a7c..23cc406a 100644 --- a/common/buildcraft/core/gui/buttons/GuiImageButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiImageButton.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import java.util.ArrayList; diff --git a/common/buildcraft/core/gui/buttons/GuiMultiButton.java b/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java similarity index 96% rename from common/buildcraft/core/gui/buttons/GuiMultiButton.java rename to common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java index 03495bc1..d57ee1b6 100644 --- a/common/buildcraft/core/gui/buttons/GuiMultiButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import org.lwjgl.opengl.GL11; @@ -16,7 +16,7 @@ import net.minecraft.client.gui.FontRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTip; @SideOnly(Side.CLIENT) public class GuiMultiButton extends GuiBetterButton { diff --git a/common/buildcraft/core/gui/buttons/GuiToggleButton.java b/common/buildcraft/core/lib/gui/buttons/GuiToggleButton.java similarity index 97% rename from common/buildcraft/core/gui/buttons/GuiToggleButton.java rename to common/buildcraft/core/lib/gui/buttons/GuiToggleButton.java index e2c53fed..1d252eeb 100644 --- a/common/buildcraft/core/gui/buttons/GuiToggleButton.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiToggleButton.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public class GuiToggleButton extends GuiBetterButton { diff --git a/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java b/common/buildcraft/core/lib/gui/buttons/GuiToggleButtonSmall.java similarity index 94% rename from common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java rename to common/buildcraft/core/lib/gui/buttons/GuiToggleButtonSmall.java index b3ba03a5..6ac51f8f 100644 --- a/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java +++ b/common/buildcraft/core/lib/gui/buttons/GuiToggleButtonSmall.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java b/common/buildcraft/core/lib/gui/buttons/IButtonClickEventListener.java similarity index 91% rename from common/buildcraft/core/gui/buttons/IButtonClickEventListener.java rename to common/buildcraft/core/lib/gui/buttons/IButtonClickEventListener.java index 1d20f98e..29da3f87 100644 --- a/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java +++ b/common/buildcraft/core/lib/gui/buttons/IButtonClickEventListener.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public interface IButtonClickEventListener { void handleButtonClick(IButtonClickEventTrigger button, int buttonId); diff --git a/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java b/common/buildcraft/core/lib/gui/buttons/IButtonClickEventTrigger.java similarity index 92% rename from common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java rename to common/buildcraft/core/lib/gui/buttons/IButtonClickEventTrigger.java index 26a47f8b..bd1ba4c9 100644 --- a/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java +++ b/common/buildcraft/core/lib/gui/buttons/IButtonClickEventTrigger.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public interface IButtonClickEventTrigger { void registerListener(IButtonClickEventListener listener); diff --git a/common/buildcraft/core/gui/buttons/IButtonTextureSet.java b/common/buildcraft/core/lib/gui/buttons/IButtonTextureSet.java similarity index 90% rename from common/buildcraft/core/gui/buttons/IButtonTextureSet.java rename to common/buildcraft/core/lib/gui/buttons/IButtonTextureSet.java index d62354c1..e0a7286d 100644 --- a/common/buildcraft/core/gui/buttons/IButtonTextureSet.java +++ b/common/buildcraft/core/lib/gui/buttons/IButtonTextureSet.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public interface IButtonTextureSet { diff --git a/common/buildcraft/core/gui/buttons/IMultiButtonState.java b/common/buildcraft/core/lib/gui/buttons/IMultiButtonState.java similarity index 83% rename from common/buildcraft/core/gui/buttons/IMultiButtonState.java rename to common/buildcraft/core/lib/gui/buttons/IMultiButtonState.java index aec8677f..97abdd4d 100644 --- a/common/buildcraft/core/gui/buttons/IMultiButtonState.java +++ b/common/buildcraft/core/lib/gui/buttons/IMultiButtonState.java @@ -6,9 +6,9 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTip; public interface IMultiButtonState { diff --git a/common/buildcraft/core/gui/buttons/LockButtonState.java b/common/buildcraft/core/lib/gui/buttons/LockButtonState.java similarity index 90% rename from common/buildcraft/core/gui/buttons/LockButtonState.java rename to common/buildcraft/core/lib/gui/buttons/LockButtonState.java index d42b971b..6e045a21 100644 --- a/common/buildcraft/core/gui/buttons/LockButtonState.java +++ b/common/buildcraft/core/lib/gui/buttons/LockButtonState.java @@ -6,9 +6,9 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTip; public enum LockButtonState implements IMultiButtonState { diff --git a/common/buildcraft/core/gui/buttons/MultiButtonController.java b/common/buildcraft/core/lib/gui/buttons/MultiButtonController.java similarity index 98% rename from common/buildcraft/core/gui/buttons/MultiButtonController.java rename to common/buildcraft/core/lib/gui/buttons/MultiButtonController.java index 05726751..3360c59a 100644 --- a/common/buildcraft/core/gui/buttons/MultiButtonController.java +++ b/common/buildcraft/core/lib/gui/buttons/MultiButtonController.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java b/common/buildcraft/core/lib/gui/buttons/StandardButtonTextureSets.java similarity index 95% rename from common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java rename to common/buildcraft/core/lib/gui/buttons/StandardButtonTextureSets.java index a6057130..8e0ba530 100644 --- a/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java +++ b/common/buildcraft/core/lib/gui/buttons/StandardButtonTextureSets.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.buttons; +package buildcraft.core.lib.gui.buttons; public enum StandardButtonTextureSets implements IButtonTextureSet { diff --git a/common/buildcraft/core/gui/slots/IPhantomSlot.java b/common/buildcraft/core/lib/gui/slots/IPhantomSlot.java similarity index 92% rename from common/buildcraft/core/gui/slots/IPhantomSlot.java rename to common/buildcraft/core/lib/gui/slots/IPhantomSlot.java index 459954b2..062abd1d 100644 --- a/common/buildcraft/core/gui/slots/IPhantomSlot.java +++ b/common/buildcraft/core/lib/gui/slots/IPhantomSlot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; /* * Phantom Slots don't "use" items, they are used for filters and various other logic slots. diff --git a/common/buildcraft/core/gui/slots/SlotBase.java b/common/buildcraft/core/lib/gui/slots/SlotBase.java similarity index 88% rename from common/buildcraft/core/gui/slots/SlotBase.java rename to common/buildcraft/core/lib/gui/slots/SlotBase.java index 5c247cdb..e57a78db 100644 --- a/common/buildcraft/core/gui/slots/SlotBase.java +++ b/common/buildcraft/core/lib/gui/slots/SlotBase.java @@ -6,13 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.tooltips.IToolTipProvider; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.IToolTipProvider; +import buildcraft.core.lib.gui.tooltips.ToolTip; public class SlotBase extends Slot implements IToolTipProvider { diff --git a/common/buildcraft/core/gui/slots/SlotHidden.java b/common/buildcraft/core/lib/gui/slots/SlotHidden.java similarity index 95% rename from common/buildcraft/core/gui/slots/SlotHidden.java rename to common/buildcraft/core/lib/gui/slots/SlotHidden.java index 6e5a46aa..ae502fb7 100755 --- a/common/buildcraft/core/gui/slots/SlotHidden.java +++ b/common/buildcraft/core/lib/gui/slots/SlotHidden.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/buildcraft/core/gui/slots/SlotLimited.java b/common/buildcraft/core/lib/gui/slots/SlotLimited.java similarity index 94% rename from common/buildcraft/core/gui/slots/SlotLimited.java rename to common/buildcraft/core/lib/gui/slots/SlotLimited.java index 4e066f71..711d9e47 100644 --- a/common/buildcraft/core/gui/slots/SlotLimited.java +++ b/common/buildcraft/core/lib/gui/slots/SlotLimited.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/gui/slots/SlotOutput.java b/common/buildcraft/core/lib/gui/slots/SlotOutput.java similarity index 94% rename from common/buildcraft/core/gui/slots/SlotOutput.java rename to common/buildcraft/core/lib/gui/slots/SlotOutput.java index 3bbe96d7..b2916a9d 100644 --- a/common/buildcraft/core/gui/slots/SlotOutput.java +++ b/common/buildcraft/core/lib/gui/slots/SlotOutput.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/gui/slots/SlotPhantom.java b/common/buildcraft/core/lib/gui/slots/SlotPhantom.java similarity index 95% rename from common/buildcraft/core/gui/slots/SlotPhantom.java rename to common/buildcraft/core/lib/gui/slots/SlotPhantom.java index 6ea7b03a..00bd334e 100644 --- a/common/buildcraft/core/gui/slots/SlotPhantom.java +++ b/common/buildcraft/core/lib/gui/slots/SlotPhantom.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/gui/slots/SlotUntouchable.java b/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java similarity index 96% rename from common/buildcraft/core/gui/slots/SlotUntouchable.java rename to common/buildcraft/core/lib/gui/slots/SlotUntouchable.java index a131c921..9d4cd5fa 100644 --- a/common/buildcraft/core/gui/slots/SlotUntouchable.java +++ b/common/buildcraft/core/lib/gui/slots/SlotUntouchable.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/gui/slots/SlotValidated.java b/common/buildcraft/core/lib/gui/slots/SlotValidated.java similarity index 94% rename from common/buildcraft/core/gui/slots/SlotValidated.java rename to common/buildcraft/core/lib/gui/slots/SlotValidated.java index 62b79663..1b170ce4 100644 --- a/common/buildcraft/core/gui/slots/SlotValidated.java +++ b/common/buildcraft/core/lib/gui/slots/SlotValidated.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/buildcraft/core/gui/slots/SlotWorkbench.java b/common/buildcraft/core/lib/gui/slots/SlotWorkbench.java similarity index 95% rename from common/buildcraft/core/gui/slots/SlotWorkbench.java rename to common/buildcraft/core/lib/gui/slots/SlotWorkbench.java index bb9e7e61..3268d772 100644 --- a/common/buildcraft/core/gui/slots/SlotWorkbench.java +++ b/common/buildcraft/core/lib/gui/slots/SlotWorkbench.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.slots; +package buildcraft.core.lib.gui.slots; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/gui/tooltips/IToolTipProvider.java b/common/buildcraft/core/lib/gui/tooltips/IToolTipProvider.java similarity index 91% rename from common/buildcraft/core/gui/tooltips/IToolTipProvider.java rename to common/buildcraft/core/lib/gui/tooltips/IToolTipProvider.java index 33b81399..bfcc4d45 100644 --- a/common/buildcraft/core/gui/tooltips/IToolTipProvider.java +++ b/common/buildcraft/core/lib/gui/tooltips/IToolTipProvider.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.tooltips; +package buildcraft.core.lib.gui.tooltips; public interface IToolTipProvider { diff --git a/common/buildcraft/core/gui/tooltips/ToolTip.java b/common/buildcraft/core/lib/gui/tooltips/ToolTip.java similarity index 97% rename from common/buildcraft/core/gui/tooltips/ToolTip.java rename to common/buildcraft/core/lib/gui/tooltips/ToolTip.java index 42a0a040..aaa59518 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTip.java +++ b/common/buildcraft/core/lib/gui/tooltips/ToolTip.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.tooltips; +package buildcraft.core.lib.gui.tooltips; import java.util.ArrayList; import java.util.Collections; diff --git a/common/buildcraft/core/gui/tooltips/ToolTipLine.java b/common/buildcraft/core/lib/gui/tooltips/ToolTipLine.java similarity index 94% rename from common/buildcraft/core/gui/tooltips/ToolTipLine.java rename to common/buildcraft/core/lib/gui/tooltips/ToolTipLine.java index 2abd24f7..ffe15121 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTipLine.java +++ b/common/buildcraft/core/lib/gui/tooltips/ToolTipLine.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.tooltips; +package buildcraft.core.lib.gui.tooltips; public class ToolTipLine { diff --git a/common/buildcraft/core/gui/widgets/ButtonWidget.java b/common/buildcraft/core/lib/gui/widgets/ButtonWidget.java similarity index 93% rename from common/buildcraft/core/gui/widgets/ButtonWidget.java rename to common/buildcraft/core/lib/gui/widgets/ButtonWidget.java index 9468f72c..0849a462 100644 --- a/common/buildcraft/core/gui/widgets/ButtonWidget.java +++ b/common/buildcraft/core/lib/gui/widgets/ButtonWidget.java @@ -6,9 +6,9 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; -import buildcraft.core.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.GuiBuildCraft; public class ButtonWidget extends Widget { diff --git a/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java b/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java similarity index 88% rename from common/buildcraft/core/gui/widgets/FluidGaugeWidget.java rename to common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java index 4e599eeb..c9c14f9f 100644 --- a/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java +++ b/common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java @@ -6,16 +6,16 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; -import buildcraft.core.fluids.Tank; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.render.FluidRenderer; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.render.FluidRenderer; public class FluidGaugeWidget extends Widget { diff --git a/common/buildcraft/core/gui/widgets/IIndicatorController.java b/common/buildcraft/core/lib/gui/widgets/IIndicatorController.java similarity index 81% rename from common/buildcraft/core/gui/widgets/IIndicatorController.java rename to common/buildcraft/core/lib/gui/widgets/IIndicatorController.java index adafaf4f..a1e04ff4 100644 --- a/common/buildcraft/core/gui/widgets/IIndicatorController.java +++ b/common/buildcraft/core/lib/gui/widgets/IIndicatorController.java @@ -6,9 +6,9 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTip; public interface IIndicatorController { diff --git a/common/buildcraft/core/gui/widgets/IndicatorController.java b/common/buildcraft/core/lib/gui/widgets/IndicatorController.java similarity index 83% rename from common/buildcraft/core/gui/widgets/IndicatorController.java rename to common/buildcraft/core/lib/gui/widgets/IndicatorController.java index 645fdbb7..13fa67b2 100644 --- a/common/buildcraft/core/gui/widgets/IndicatorController.java +++ b/common/buildcraft/core/lib/gui/widgets/IndicatorController.java @@ -6,10 +6,10 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; public abstract class IndicatorController implements IIndicatorController { diff --git a/common/buildcraft/core/gui/widgets/IndicatorWidget.java b/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java similarity index 88% rename from common/buildcraft/core/gui/widgets/IndicatorWidget.java rename to common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java index 1eb13ce1..14629cdc 100644 --- a/common/buildcraft/core/gui/widgets/IndicatorWidget.java +++ b/common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java @@ -6,13 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.tooltips.ToolTip; public class IndicatorWidget extends Widget { diff --git a/common/buildcraft/core/gui/widgets/Widget.java b/common/buildcraft/core/lib/gui/widgets/Widget.java similarity index 89% rename from common/buildcraft/core/gui/widgets/Widget.java rename to common/buildcraft/core/lib/gui/widgets/Widget.java index bb0e346c..237584ec 100644 --- a/common/buildcraft/core/gui/widgets/Widget.java +++ b/common/buildcraft/core/lib/gui/widgets/Widget.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.gui.widgets; +package buildcraft.core.lib.gui.widgets; import java.io.DataInputStream; import java.io.IOException; @@ -16,10 +16,10 @@ import net.minecraft.inventory.ICrafting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.tooltips.IToolTipProvider; -import buildcraft.core.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.tooltips.IToolTipProvider; +import buildcraft.core.lib.gui.tooltips.ToolTip; public class Widget implements IToolTipProvider { diff --git a/common/buildcraft/core/inventory/CrafterCopy.java b/common/buildcraft/core/lib/inventory/CrafterCopy.java similarity index 98% rename from common/buildcraft/core/inventory/CrafterCopy.java rename to common/buildcraft/core/lib/inventory/CrafterCopy.java index 938e47e0..dc73cf84 100644 --- a/common/buildcraft/core/inventory/CrafterCopy.java +++ b/common/buildcraft/core/lib/inventory/CrafterCopy.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/FluidHandlerCopy.java b/common/buildcraft/core/lib/inventory/FluidHandlerCopy.java similarity index 97% rename from common/buildcraft/core/inventory/FluidHandlerCopy.java rename to common/buildcraft/core/lib/inventory/FluidHandlerCopy.java index 224d9652..dae8e1bd 100755 --- a/common/buildcraft/core/inventory/FluidHandlerCopy.java +++ b/common/buildcraft/core/lib/inventory/FluidHandlerCopy.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/common/buildcraft/core/inventory/ITransactor.java b/common/buildcraft/core/lib/inventory/ITransactor.java similarity index 90% rename from common/buildcraft/core/inventory/ITransactor.java rename to common/buildcraft/core/lib/inventory/ITransactor.java index d76c6f63..9f92e5ae 100644 --- a/common/buildcraft/core/inventory/ITransactor.java +++ b/common/buildcraft/core/lib/inventory/ITransactor.java @@ -6,13 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public interface ITransactor { diff --git a/common/buildcraft/core/inventory/InvUtils.java b/common/buildcraft/core/lib/inventory/InvUtils.java similarity index 98% rename from common/buildcraft/core/inventory/InvUtils.java rename to common/buildcraft/core/lib/inventory/InvUtils.java index f8a28601..20ea5acd 100644 --- a/common/buildcraft/core/inventory/InvUtils.java +++ b/common/buildcraft/core/lib/inventory/InvUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; @@ -22,7 +22,7 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public final class InvUtils { diff --git a/common/buildcraft/core/inventory/InventoryConcatenator.java b/common/buildcraft/core/lib/inventory/InventoryConcatenator.java similarity index 98% rename from common/buildcraft/core/inventory/InventoryConcatenator.java rename to common/buildcraft/core/lib/inventory/InventoryConcatenator.java index 655d307c..938a5105 100644 --- a/common/buildcraft/core/inventory/InventoryConcatenator.java +++ b/common/buildcraft/core/lib/inventory/InventoryConcatenator.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import java.util.ArrayList; import java.util.List; diff --git a/common/buildcraft/core/inventory/InventoryCopy.java b/common/buildcraft/core/lib/inventory/InventoryCopy.java similarity index 98% rename from common/buildcraft/core/inventory/InventoryCopy.java rename to common/buildcraft/core/lib/inventory/InventoryCopy.java index 0b1485b9..a14d4960 100644 --- a/common/buildcraft/core/inventory/InventoryCopy.java +++ b/common/buildcraft/core/lib/inventory/InventoryCopy.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/inventory/InventoryIterator.java b/common/buildcraft/core/lib/inventory/InventoryIterator.java similarity index 96% rename from common/buildcraft/core/inventory/InventoryIterator.java rename to common/buildcraft/core/lib/inventory/InventoryIterator.java index 865e08d6..976ece08 100644 --- a/common/buildcraft/core/inventory/InventoryIterator.java +++ b/common/buildcraft/core/lib/inventory/InventoryIterator.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/common/buildcraft/core/inventory/InventoryIteratorSided.java b/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java similarity index 98% rename from common/buildcraft/core/inventory/InventoryIteratorSided.java rename to common/buildcraft/core/lib/inventory/InventoryIteratorSided.java index 3b367d02..41a3d59e 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSided.java +++ b/common/buildcraft/core/lib/inventory/InventoryIteratorSided.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import java.util.Iterator; diff --git a/common/buildcraft/core/inventory/InventoryIteratorSimple.java b/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java similarity index 97% rename from common/buildcraft/core/inventory/InventoryIteratorSimple.java rename to common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java index 48e7f2ae..cf61e9d8 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSimple.java +++ b/common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import java.util.Iterator; diff --git a/common/buildcraft/core/inventory/InventoryMapper.java b/common/buildcraft/core/lib/inventory/InventoryMapper.java similarity index 98% rename from common/buildcraft/core/inventory/InventoryMapper.java rename to common/buildcraft/core/lib/inventory/InventoryMapper.java index 6eb8ebba..b08268a1 100644 --- a/common/buildcraft/core/inventory/InventoryMapper.java +++ b/common/buildcraft/core/lib/inventory/InventoryMapper.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/inventory/InventoryWrapper.java b/common/buildcraft/core/lib/inventory/InventoryWrapper.java similarity index 98% rename from common/buildcraft/core/inventory/InventoryWrapper.java rename to common/buildcraft/core/lib/inventory/InventoryWrapper.java index 5383b63a..e90b46c0 100644 --- a/common/buildcraft/core/inventory/InventoryWrapper.java +++ b/common/buildcraft/core/lib/inventory/InventoryWrapper.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/common/buildcraft/core/inventory/InventoryWrapperSimple.java b/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java similarity index 92% rename from common/buildcraft/core/inventory/InventoryWrapperSimple.java rename to common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java index c33c63ac..b15e6b94 100644 --- a/common/buildcraft/core/inventory/InventoryWrapperSimple.java +++ b/common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java @@ -6,12 +6,12 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class InventoryWrapperSimple extends InventoryWrapper { diff --git a/common/buildcraft/core/inventory/SimpleInventory.java b/common/buildcraft/core/lib/inventory/SimpleInventory.java similarity index 99% rename from common/buildcraft/core/inventory/SimpleInventory.java rename to common/buildcraft/core/lib/inventory/SimpleInventory.java index 717e216e..0bde6b72 100644 --- a/common/buildcraft/core/inventory/SimpleInventory.java +++ b/common/buildcraft/core/lib/inventory/SimpleInventory.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import java.util.LinkedList; diff --git a/common/buildcraft/core/inventory/StackHelper.java b/common/buildcraft/core/lib/inventory/StackHelper.java similarity index 99% rename from common/buildcraft/core/inventory/StackHelper.java rename to common/buildcraft/core/lib/inventory/StackHelper.java index 91121bfc..45b5260a 100644 --- a/common/buildcraft/core/inventory/StackHelper.java +++ b/common/buildcraft/core/lib/inventory/StackHelper.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/Transactor.java b/common/buildcraft/core/lib/inventory/Transactor.java similarity index 96% rename from common/buildcraft/core/inventory/Transactor.java rename to common/buildcraft/core/lib/inventory/Transactor.java index 02684421..3a5da9c2 100644 --- a/common/buildcraft/core/inventory/Transactor.java +++ b/common/buildcraft/core/lib/inventory/Transactor.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/common/buildcraft/core/inventory/TransactorRoundRobin.java b/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java similarity index 97% rename from common/buildcraft/core/inventory/TransactorRoundRobin.java rename to common/buildcraft/core/lib/inventory/TransactorRoundRobin.java index c4f5019f..cce8a78d 100644 --- a/common/buildcraft/core/inventory/TransactorRoundRobin.java +++ b/common/buildcraft/core/lib/inventory/TransactorRoundRobin.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/TransactorSimple.java b/common/buildcraft/core/lib/inventory/TransactorSimple.java similarity index 97% rename from common/buildcraft/core/inventory/TransactorSimple.java rename to common/buildcraft/core/lib/inventory/TransactorSimple.java index bfb12132..e57aba2e 100644 --- a/common/buildcraft/core/inventory/TransactorSimple.java +++ b/common/buildcraft/core/lib/inventory/TransactorSimple.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory; +package buildcraft.core.lib.inventory; import java.util.ArrayList; import java.util.List; @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public class TransactorSimple extends Transactor { diff --git a/common/buildcraft/core/inventory/filters/AggregateFilter.java b/common/buildcraft/core/lib/inventory/filters/AggregateFilter.java similarity index 94% rename from common/buildcraft/core/inventory/filters/AggregateFilter.java rename to common/buildcraft/core/lib/inventory/filters/AggregateFilter.java index 5ceec4d3..a8535631 100644 --- a/common/buildcraft/core/inventory/filters/AggregateFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/AggregateFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java similarity index 96% rename from common/buildcraft/core/inventory/filters/ArrayFluidFilter.java rename to common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java index 10755f39..1fa4d9c3 100755 --- a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java similarity index 92% rename from common/buildcraft/core/inventory/filters/ArrayStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java index f507ea3c..df6d2548 100644 --- a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java @@ -6,11 +6,11 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; /** * Returns true if the stack matches any one one of the filter stacks. diff --git a/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java b/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java similarity index 89% rename from common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java rename to common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java index a90d02c9..64190a09 100755 --- a/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java @@ -6,11 +6,11 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; /** * Returns true if the stack matches any one one of the filter stacks. Takes diff --git a/common/buildcraft/core/inventory/filters/CompositeFilter.java b/common/buildcraft/core/lib/inventory/filters/CompositeFilter.java similarity index 94% rename from common/buildcraft/core/inventory/filters/CompositeFilter.java rename to common/buildcraft/core/lib/inventory/filters/CompositeFilter.java index e587e8fd..58879f33 100755 --- a/common/buildcraft/core/inventory/filters/CompositeFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/CompositeFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/CraftingFilter.java b/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java similarity index 91% rename from common/buildcraft/core/inventory/filters/CraftingFilter.java rename to common/buildcraft/core/lib/inventory/filters/CraftingFilter.java index 8e492425..a5c5b750 100644 --- a/common/buildcraft/core/inventory/filters/CraftingFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/CraftingFilter.java @@ -6,11 +6,11 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; /** * Returns true if the stack matches any one one of the filter stacks. diff --git a/common/buildcraft/core/inventory/filters/IFluidFilter.java b/common/buildcraft/core/lib/inventory/filters/IFluidFilter.java similarity index 89% rename from common/buildcraft/core/inventory/filters/IFluidFilter.java rename to common/buildcraft/core/lib/inventory/filters/IFluidFilter.java index d2b78c91..76575d7f 100755 --- a/common/buildcraft/core/inventory/filters/IFluidFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/IFluidFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraftforge.fluids.Fluid; diff --git a/common/buildcraft/core/inventory/filters/IStackFilter.java b/common/buildcraft/core/lib/inventory/filters/IStackFilter.java similarity index 92% rename from common/buildcraft/core/inventory/filters/IStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/IStackFilter.java index 9ef0f5a5..b13ac5e5 100644 --- a/common/buildcraft/core/inventory/filters/IStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/IStackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/InvertedStackFilter.java b/common/buildcraft/core/lib/inventory/filters/InvertedStackFilter.java similarity index 93% rename from common/buildcraft/core/inventory/filters/InvertedStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/InvertedStackFilter.java index 519a0356..379e53fc 100644 --- a/common/buildcraft/core/inventory/filters/InvertedStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/InvertedStackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/OreStackFilter.java b/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java similarity index 95% rename from common/buildcraft/core/inventory/filters/OreStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/OreStackFilter.java index 6426f194..7106c7b3 100755 --- a/common/buildcraft/core/inventory/filters/OreStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/OreStackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java b/common/buildcraft/core/lib/inventory/filters/PassThroughFluidFilter.java similarity index 92% rename from common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java rename to common/buildcraft/core/lib/inventory/filters/PassThroughFluidFilter.java index fbe209b3..10f6d260 100755 --- a/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/PassThroughFluidFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraftforge.fluids.Fluid; diff --git a/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java b/common/buildcraft/core/lib/inventory/filters/PassThroughStackFilter.java similarity index 92% rename from common/buildcraft/core/inventory/filters/PassThroughStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/PassThroughStackFilter.java index 3066807a..7485901a 100755 --- a/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/PassThroughStackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java b/common/buildcraft/core/lib/inventory/filters/SimpleFluidFilter.java similarity index 94% rename from common/buildcraft/core/inventory/filters/SimpleFluidFilter.java rename to common/buildcraft/core/lib/inventory/filters/SimpleFluidFilter.java index f4046b46..8dcc9743 100755 --- a/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/SimpleFluidFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/common/buildcraft/core/inventory/filters/StackFilter.java b/common/buildcraft/core/lib/inventory/filters/StackFilter.java similarity index 95% rename from common/buildcraft/core/inventory/filters/StackFilter.java rename to common/buildcraft/core/lib/inventory/filters/StackFilter.java index 82ffd301..5d272da6 100644 --- a/common/buildcraft/core/inventory/filters/StackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/StackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; diff --git a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java similarity index 95% rename from common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java rename to common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java index 06ab3251..6abdf06e 100755 --- a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.inventory.filters; +package buildcraft.core.lib.inventory.filters; import java.util.ArrayList; diff --git a/common/buildcraft/core/ItemBlockBuildCraft.java b/common/buildcraft/core/lib/items/ItemBlockBuildCraft.java similarity index 93% rename from common/buildcraft/core/ItemBlockBuildCraft.java rename to common/buildcraft/core/lib/items/ItemBlockBuildCraft.java index c364a545..11754c21 100644 --- a/common/buildcraft/core/ItemBlockBuildCraft.java +++ b/common/buildcraft/core/lib/items/ItemBlockBuildCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.items; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/lib/items/ItemBuildCraft.java similarity index 95% rename from common/buildcraft/core/ItemBuildCraft.java rename to common/buildcraft/core/lib/items/ItemBuildCraft.java index 7927f52d..e890bc9c 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/lib/items/ItemBuildCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -16,6 +16,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.core.BCCreativeTab; public class ItemBuildCraft extends Item { diff --git a/common/buildcraft/core/network/ChannelHandler.java b/common/buildcraft/core/lib/network/ChannelHandler.java similarity index 93% rename from common/buildcraft/core/network/ChannelHandler.java rename to common/buildcraft/core/lib/network/ChannelHandler.java index bccff838..98798432 100755 --- a/common/buildcraft/core/network/ChannelHandler.java +++ b/common/buildcraft/core/lib/network/ChannelHandler.java @@ -6,12 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; +import buildcraft.core.lib.network.command.PacketCommand; public class ChannelHandler extends FMLIndexedMessageToMessageCodec { private int maxDiscriminator; diff --git a/common/buildcraft/core/network/IGuiReturnHandler.java b/common/buildcraft/core/lib/network/IGuiReturnHandler.java similarity index 93% rename from common/buildcraft/core/network/IGuiReturnHandler.java rename to common/buildcraft/core/lib/network/IGuiReturnHandler.java index f36ee8de..d68ac522 100644 --- a/common/buildcraft/core/network/IGuiReturnHandler.java +++ b/common/buildcraft/core/lib/network/IGuiReturnHandler.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/ISyncedTile.java b/common/buildcraft/core/lib/network/ISyncedTile.java similarity index 95% rename from common/buildcraft/core/network/ISyncedTile.java rename to common/buildcraft/core/lib/network/ISyncedTile.java index a7ff2879..b49e2115 100644 --- a/common/buildcraft/core/network/ISyncedTile.java +++ b/common/buildcraft/core/lib/network/ISyncedTile.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import buildcraft.api.core.ISerializable; diff --git a/common/buildcraft/core/network/Packet.java b/common/buildcraft/core/lib/network/Packet.java similarity index 93% rename from common/buildcraft/core/network/Packet.java rename to common/buildcraft/core/lib/network/Packet.java index 3fa4ab9c..8cb3b6dd 100644 --- a/common/buildcraft/core/network/Packet.java +++ b/common/buildcraft/core/lib/network/Packet.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/PacketCoordinates.java b/common/buildcraft/core/lib/network/PacketCoordinates.java similarity index 96% rename from common/buildcraft/core/network/PacketCoordinates.java rename to common/buildcraft/core/lib/network/PacketCoordinates.java index 4c0b2dd0..e5f3fd01 100644 --- a/common/buildcraft/core/network/PacketCoordinates.java +++ b/common/buildcraft/core/lib/network/PacketCoordinates.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/PacketGuiReturn.java b/common/buildcraft/core/lib/network/PacketGuiReturn.java similarity index 96% rename from common/buildcraft/core/network/PacketGuiReturn.java rename to common/buildcraft/core/lib/network/PacketGuiReturn.java index 7e2ffa1f..d590366b 100644 --- a/common/buildcraft/core/network/PacketGuiReturn.java +++ b/common/buildcraft/core/lib/network/PacketGuiReturn.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; @@ -18,6 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import buildcraft.BuildCraftCore; +import buildcraft.core.network.PacketIds; public class PacketGuiReturn extends Packet { private EntityPlayer sender; diff --git a/common/buildcraft/core/network/PacketGuiWidget.java b/common/buildcraft/core/lib/network/PacketGuiWidget.java similarity index 91% rename from common/buildcraft/core/network/PacketGuiWidget.java rename to common/buildcraft/core/lib/network/PacketGuiWidget.java index ceea9af7..ab78778f 100644 --- a/common/buildcraft/core/network/PacketGuiWidget.java +++ b/common/buildcraft/core/lib/network/PacketGuiWidget.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; @@ -14,7 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.client.FMLClientHandler; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.network.PacketIds; public class PacketGuiWidget extends Packet { diff --git a/common/buildcraft/core/network/PacketHandler.java b/common/buildcraft/core/lib/network/PacketHandler.java similarity index 94% rename from common/buildcraft/core/network/PacketHandler.java rename to common/buildcraft/core/lib/network/PacketHandler.java index 41e88001..093bae99 100644 --- a/common/buildcraft/core/network/PacketHandler.java +++ b/common/buildcraft/core/lib/network/PacketHandler.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import java.io.IOException; @@ -22,6 +22,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; import buildcraft.api.core.ISerializable; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; @Sharable diff --git a/common/buildcraft/core/network/PacketNBT.java b/common/buildcraft/core/lib/network/PacketNBT.java similarity index 97% rename from common/buildcraft/core/network/PacketNBT.java rename to common/buildcraft/core/lib/network/PacketNBT.java index 99b2f884..787d8319 100644 --- a/common/buildcraft/core/network/PacketNBT.java +++ b/common/buildcraft/core/lib/network/PacketNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import java.io.IOException; diff --git a/common/buildcraft/core/network/PacketSlotChange.java b/common/buildcraft/core/lib/network/PacketSlotChange.java similarity index 89% rename from common/buildcraft/core/network/PacketSlotChange.java rename to common/buildcraft/core/lib/network/PacketSlotChange.java index 2c6178f7..7c038525 100644 --- a/common/buildcraft/core/network/PacketSlotChange.java +++ b/common/buildcraft/core/lib/network/PacketSlotChange.java @@ -6,14 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.NetworkUtils; public class PacketSlotChange extends PacketCoordinates { diff --git a/common/buildcraft/core/network/PacketTileState.java b/common/buildcraft/core/lib/network/PacketTileState.java similarity index 96% rename from common/buildcraft/core/network/PacketTileState.java rename to common/buildcraft/core/lib/network/PacketTileState.java index 6e6bb0de..c531a2f6 100644 --- a/common/buildcraft/core/network/PacketTileState.java +++ b/common/buildcraft/core/lib/network/PacketTileState.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import java.io.IOException; import java.util.LinkedList; @@ -16,6 +16,7 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import buildcraft.api.core.ISerializable; +import buildcraft.core.network.PacketIds; public class PacketTileState extends PacketCoordinates { diff --git a/common/buildcraft/core/network/PacketTileUpdate.java b/common/buildcraft/core/lib/network/PacketTileUpdate.java similarity index 92% rename from common/buildcraft/core/network/PacketTileUpdate.java rename to common/buildcraft/core/lib/network/PacketTileUpdate.java index ccd9b0c2..b2bcb10f 100644 --- a/common/buildcraft/core/network/PacketTileUpdate.java +++ b/common/buildcraft/core/lib/network/PacketTileUpdate.java @@ -6,12 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import buildcraft.api.core.ISerializable; +import buildcraft.core.network.PacketIds; public class PacketTileUpdate extends PacketUpdate { diff --git a/common/buildcraft/core/network/PacketUpdate.java b/common/buildcraft/core/lib/network/PacketUpdate.java similarity index 97% rename from common/buildcraft/core/network/PacketUpdate.java rename to common/buildcraft/core/lib/network/PacketUpdate.java index 444df8ee..a68d314f 100644 --- a/common/buildcraft/core/network/PacketUpdate.java +++ b/common/buildcraft/core/lib/network/PacketUpdate.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/Serializable.java b/common/buildcraft/core/lib/network/Serializable.java similarity index 86% rename from common/buildcraft/core/network/Serializable.java rename to common/buildcraft/core/lib/network/Serializable.java index af3d6a4c..ec261a89 100644 --- a/common/buildcraft/core/network/Serializable.java +++ b/common/buildcraft/core/lib/network/Serializable.java @@ -1,4 +1,4 @@ -package buildcraft.core.network; +package buildcraft.core.lib.network; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/CommandTarget.java b/common/buildcraft/core/lib/network/command/CommandTarget.java similarity index 93% rename from common/buildcraft/core/network/CommandTarget.java rename to common/buildcraft/core/lib/network/command/CommandTarget.java index b4783b4a..25fa2742 100644 --- a/common/buildcraft/core/network/CommandTarget.java +++ b/common/buildcraft/core/lib/network/command/CommandTarget.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/CommandTargetContainer.java b/common/buildcraft/core/lib/network/command/CommandTargetContainer.java similarity index 95% rename from common/buildcraft/core/network/CommandTargetContainer.java rename to common/buildcraft/core/lib/network/command/CommandTargetContainer.java index b6d5de4c..cfb3dfc1 100644 --- a/common/buildcraft/core/network/CommandTargetContainer.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetContainer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/CommandTargetEntity.java b/common/buildcraft/core/lib/network/command/CommandTargetEntity.java similarity index 95% rename from common/buildcraft/core/network/CommandTargetEntity.java rename to common/buildcraft/core/lib/network/command/CommandTargetEntity.java index a2f02dd0..6eb000f7 100644 --- a/common/buildcraft/core/network/CommandTargetEntity.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetEntity.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/CommandTargetTile.java b/common/buildcraft/core/lib/network/command/CommandTargetTile.java similarity index 96% rename from common/buildcraft/core/network/CommandTargetTile.java rename to common/buildcraft/core/lib/network/command/CommandTargetTile.java index abe1c0ae..8bfddc5d 100644 --- a/common/buildcraft/core/network/CommandTargetTile.java +++ b/common/buildcraft/core/lib/network/command/CommandTargetTile.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/CommandWriter.java b/common/buildcraft/core/lib/network/command/CommandWriter.java similarity index 90% rename from common/buildcraft/core/network/CommandWriter.java rename to common/buildcraft/core/lib/network/command/CommandWriter.java index b99d85c3..8988ee66 100644 --- a/common/buildcraft/core/network/CommandWriter.java +++ b/common/buildcraft/core/lib/network/command/CommandWriter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/ICommandReceiver.java b/common/buildcraft/core/lib/network/command/ICommandReceiver.java similarity index 91% rename from common/buildcraft/core/network/ICommandReceiver.java rename to common/buildcraft/core/lib/network/command/ICommandReceiver.java index 4e880f21..1f9c415b 100644 --- a/common/buildcraft/core/network/ICommandReceiver.java +++ b/common/buildcraft/core/lib/network/command/ICommandReceiver.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import io.netty.buffer.ByteBuf; diff --git a/common/buildcraft/core/network/PacketCommand.java b/common/buildcraft/core/lib/network/command/PacketCommand.java similarity index 92% rename from common/buildcraft/core/network/PacketCommand.java rename to common/buildcraft/core/lib/network/command/PacketCommand.java index c0414a82..f4510f78 100644 --- a/common/buildcraft/core/network/PacketCommand.java +++ b/common/buildcraft/core/lib/network/command/PacketCommand.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.network; +package buildcraft.core.lib.network.command; import java.util.ArrayList; @@ -16,7 +16,9 @@ import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.FMLCommonHandler; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.network.PacketIds; public class PacketCommand extends Packet { public static final ArrayList targets; diff --git a/common/buildcraft/core/render/BCDynamicTexture.java b/common/buildcraft/core/lib/render/DynamicTexturePaletted.java similarity index 95% rename from common/buildcraft/core/render/BCDynamicTexture.java rename to common/buildcraft/core/lib/render/DynamicTexturePaletted.java index 8bf4dceb..7552640a 100755 --- a/common/buildcraft/core/render/BCDynamicTexture.java +++ b/common/buildcraft/core/lib/render/DynamicTexturePaletted.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.core.lib.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.DynamicTexture; @@ -14,7 +14,7 @@ import net.minecraft.client.renderer.texture.DynamicTexture; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BCDynamicTexture { +public class DynamicTexturePaletted { public int width, height; public int[] colorMap; @@ -22,7 +22,7 @@ public class BCDynamicTexture { @SideOnly(Side.CLIENT) private DynamicTexture dynamicTexture; - public BCDynamicTexture(int iWidth, int iHeight) { + public DynamicTexturePaletted(int iWidth, int iHeight) { width = iWidth; height = iHeight; colorMap = new int[iWidth * iHeight]; diff --git a/common/buildcraft/core/render/FluidRenderer.java b/common/buildcraft/core/lib/render/FluidRenderer.java similarity index 97% rename from common/buildcraft/core/render/FluidRenderer.java rename to common/buildcraft/core/lib/render/FluidRenderer.java index 99c2695a..c500c270 100644 --- a/common/buildcraft/core/render/FluidRenderer.java +++ b/common/buildcraft/core/lib/render/FluidRenderer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.core.lib.render; import java.util.HashMap; import java.util.Map; @@ -24,7 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import buildcraft.core.render.RenderEntityBlock.RenderInfo; +import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; public final class FluidRenderer { diff --git a/common/buildcraft/core/ICustomHighlight.java b/common/buildcraft/core/lib/render/ICustomHighlight.java similarity index 94% rename from common/buildcraft/core/ICustomHighlight.java rename to common/buildcraft/core/lib/render/ICustomHighlight.java index 94e0747d..27ec68de 100644 --- a/common/buildcraft/core/ICustomHighlight.java +++ b/common/buildcraft/core/lib/render/ICustomHighlight.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.render; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; diff --git a/common/buildcraft/core/IInventoryRenderer.java b/common/buildcraft/core/lib/render/IInventoryRenderer.java similarity index 93% rename from common/buildcraft/core/IInventoryRenderer.java rename to common/buildcraft/core/lib/render/IInventoryRenderer.java index dd698e81..38b24557 100644 --- a/common/buildcraft/core/IInventoryRenderer.java +++ b/common/buildcraft/core/lib/render/IInventoryRenderer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.core.lib.render; /** * This interface is used to provide special renders of tiles in the player diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/lib/render/RenderEntityBlock.java similarity index 98% rename from common/buildcraft/core/render/RenderEntityBlock.java rename to common/buildcraft/core/lib/render/RenderEntityBlock.java index 2f9f0e7a..9cba6d59 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/lib/render/RenderEntityBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.core.lib.render; import java.util.Arrays; @@ -23,7 +23,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; public final class RenderEntityBlock extends Render { diff --git a/common/buildcraft/core/render/RenderUtils.java b/common/buildcraft/core/lib/render/RenderUtils.java similarity index 94% rename from common/buildcraft/core/render/RenderUtils.java rename to common/buildcraft/core/lib/render/RenderUtils.java index 4663b78d..213515eb 100644 --- a/common/buildcraft/core/render/RenderUtils.java +++ b/common/buildcraft/core/lib/render/RenderUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.core.lib.render; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/render/RenderVoid.java b/common/buildcraft/core/lib/render/RenderVoid.java similarity index 95% rename from common/buildcraft/core/render/RenderVoid.java rename to common/buildcraft/core/lib/render/RenderVoid.java index fae1f884..3f51065c 100644 --- a/common/buildcraft/core/render/RenderVoid.java +++ b/common/buildcraft/core/lib/render/RenderVoid.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.core.lib.render; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/common/buildcraft/core/utils/Average.java b/common/buildcraft/core/lib/utils/Average.java similarity index 96% rename from common/buildcraft/core/utils/Average.java rename to common/buildcraft/core/lib/utils/Average.java index 7eac9856..f72fea58 100644 --- a/common/buildcraft/core/utils/Average.java +++ b/common/buildcraft/core/lib/utils/Average.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; public class Average { private double[] data; diff --git a/common/buildcraft/core/utils/BitSetUtils.java b/common/buildcraft/core/lib/utils/BitSetUtils.java similarity index 95% rename from common/buildcraft/core/utils/BitSetUtils.java rename to common/buildcraft/core/lib/utils/BitSetUtils.java index 85851880..7810e2ac 100644 --- a/common/buildcraft/core/utils/BitSetUtils.java +++ b/common/buildcraft/core/lib/utils/BitSetUtils.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.BitSet; diff --git a/common/buildcraft/factory/BlockMiner.java b/common/buildcraft/core/lib/utils/BlockMiner.java similarity index 96% rename from common/buildcraft/factory/BlockMiner.java rename to common/buildcraft/core/lib/utils/BlockMiner.java index e1747ae3..c72f4d40 100644 --- a/common/buildcraft/factory/BlockMiner.java +++ b/common/buildcraft/core/lib/utils/BlockMiner.java @@ -1,4 +1,4 @@ -package buildcraft.factory; +package buildcraft.core.lib.utils; import java.util.List; @@ -15,9 +15,6 @@ import net.minecraftforge.event.world.BlockEvent; import buildcraft.BuildCraftCore; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; -import buildcraft.core.utils.MathUtils; -import buildcraft.core.utils.Utils; public class BlockMiner { protected final World world; diff --git a/common/buildcraft/core/utils/BlockScanner.java b/common/buildcraft/core/lib/utils/BlockScanner.java similarity index 98% rename from common/buildcraft/core/utils/BlockScanner.java rename to common/buildcraft/core/lib/utils/BlockScanner.java index 5d9db22e..0ba8eafa 100755 --- a/common/buildcraft/core/utils/BlockScanner.java +++ b/common/buildcraft/core/lib/utils/BlockScanner.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Iterator; diff --git a/common/buildcraft/core/utils/BlockScannerExpanding.java b/common/buildcraft/core/lib/utils/BlockScannerExpanding.java similarity index 97% rename from common/buildcraft/core/utils/BlockScannerExpanding.java rename to common/buildcraft/core/lib/utils/BlockScannerExpanding.java index e0eebd8b..9fbfa238 100644 --- a/common/buildcraft/core/utils/BlockScannerExpanding.java +++ b/common/buildcraft/core/lib/utils/BlockScannerExpanding.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Iterator; diff --git a/common/buildcraft/core/utils/BlockScannerRandom.java b/common/buildcraft/core/lib/utils/BlockScannerRandom.java similarity index 96% rename from common/buildcraft/core/utils/BlockScannerRandom.java rename to common/buildcraft/core/lib/utils/BlockScannerRandom.java index 28d42832..ddd6025a 100644 --- a/common/buildcraft/core/utils/BlockScannerRandom.java +++ b/common/buildcraft/core/lib/utils/BlockScannerRandom.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Iterator; import java.util.Random; diff --git a/common/buildcraft/core/utils/BlockScannerZoneRandom.java b/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java similarity index 96% rename from common/buildcraft/core/utils/BlockScannerZoneRandom.java rename to common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java index c6d5f82d..d1b619a2 100644 --- a/common/buildcraft/core/utils/BlockScannerZoneRandom.java +++ b/common/buildcraft/core/lib/utils/BlockScannerZoneRandom.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Iterator; import java.util.Random; diff --git a/common/buildcraft/core/utils/BlockUtils.java b/common/buildcraft/core/lib/utils/BlockUtils.java similarity index 99% rename from common/buildcraft/core/utils/BlockUtils.java rename to common/buildcraft/core/lib/utils/BlockUtils.java index 40687e98..4b57a18e 100644 --- a/common/buildcraft/core/utils/BlockUtils.java +++ b/common/buildcraft/core/lib/utils/BlockUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.List; diff --git a/common/buildcraft/core/utils/ColorUtils.java b/common/buildcraft/core/lib/utils/ColorUtils.java similarity index 98% rename from common/buildcraft/core/utils/ColorUtils.java rename to common/buildcraft/core/lib/utils/ColorUtils.java index e97ad277..d27f09d5 100644 --- a/common/buildcraft/core/utils/ColorUtils.java +++ b/common/buildcraft/core/lib/utils/ColorUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/utils/ConfigUtils.java b/common/buildcraft/core/lib/utils/ConfigUtils.java similarity index 99% rename from common/buildcraft/core/utils/ConfigUtils.java rename to common/buildcraft/core/lib/utils/ConfigUtils.java index c38bb228..39295e58 100644 --- a/common/buildcraft/core/utils/ConfigUtils.java +++ b/common/buildcraft/core/lib/utils/ConfigUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import org.apache.logging.log4j.Level; diff --git a/common/buildcraft/core/utils/CraftingUtils.java b/common/buildcraft/core/lib/utils/CraftingUtils.java similarity index 98% rename from common/buildcraft/core/utils/CraftingUtils.java rename to common/buildcraft/core/lib/utils/CraftingUtils.java index bd641855..edef070b 100644 --- a/common/buildcraft/core/utils/CraftingUtils.java +++ b/common/buildcraft/core/lib/utils/CraftingUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.List; diff --git a/common/buildcraft/core/utils/FluidUtils.java b/common/buildcraft/core/lib/utils/FluidUtils.java similarity index 97% rename from common/buildcraft/core/utils/FluidUtils.java rename to common/buildcraft/core/lib/utils/FluidUtils.java index 9219daca..c7465b3c 100644 --- a/common/buildcraft/core/utils/FluidUtils.java +++ b/common/buildcraft/core/lib/utils/FluidUtils.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/common/buildcraft/core/utils/IBlockFilter.java b/common/buildcraft/core/lib/utils/IBlockFilter.java similarity index 92% rename from common/buildcraft/core/utils/IBlockFilter.java rename to common/buildcraft/core/lib/utils/IBlockFilter.java index 8ed3874b..a9695f25 100755 --- a/common/buildcraft/core/utils/IBlockFilter.java +++ b/common/buildcraft/core/lib/utils/IBlockFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import net.minecraft.world.World; diff --git a/common/buildcraft/core/utils/IEntityFilter.java b/common/buildcraft/core/lib/utils/IEntityFilter.java similarity index 92% rename from common/buildcraft/core/utils/IEntityFilter.java rename to common/buildcraft/core/lib/utils/IEntityFilter.java index 189391b7..ddaa78b4 100755 --- a/common/buildcraft/core/utils/IEntityFilter.java +++ b/common/buildcraft/core/lib/utils/IEntityFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import net.minecraft.entity.Entity; diff --git a/common/buildcraft/core/utils/IIterableAlgorithm.java b/common/buildcraft/core/lib/utils/IIterableAlgorithm.java similarity index 91% rename from common/buildcraft/core/utils/IIterableAlgorithm.java rename to common/buildcraft/core/lib/utils/IIterableAlgorithm.java index 5644e844..6398240d 100644 --- a/common/buildcraft/core/utils/IIterableAlgorithm.java +++ b/common/buildcraft/core/lib/utils/IIterableAlgorithm.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; public interface IIterableAlgorithm { diff --git a/common/buildcraft/core/utils/IterableAlgorithmRunner.java b/common/buildcraft/core/lib/utils/IterableAlgorithmRunner.java similarity index 97% rename from common/buildcraft/core/utils/IterableAlgorithmRunner.java rename to common/buildcraft/core/lib/utils/IterableAlgorithmRunner.java index 3335b489..938d4387 100755 --- a/common/buildcraft/core/utils/IterableAlgorithmRunner.java +++ b/common/buildcraft/core/lib/utils/IterableAlgorithmRunner.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Date; diff --git a/common/buildcraft/core/utils/MathUtils.java b/common/buildcraft/core/lib/utils/MathUtils.java similarity index 95% rename from common/buildcraft/core/utils/MathUtils.java rename to common/buildcraft/core/lib/utils/MathUtils.java index 8196deef..4ba56ed9 100644 --- a/common/buildcraft/core/utils/MathUtils.java +++ b/common/buildcraft/core/lib/utils/MathUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; public final class MathUtils { diff --git a/common/buildcraft/core/utils/MatrixTranformations.java b/common/buildcraft/core/lib/utils/MatrixTranformations.java similarity index 98% rename from common/buildcraft/core/utils/MatrixTranformations.java rename to common/buildcraft/core/lib/utils/MatrixTranformations.java index 885d7fa6..73d6ac40 100644 --- a/common/buildcraft/core/utils/MatrixTranformations.java +++ b/common/buildcraft/core/lib/utils/MatrixTranformations.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import net.minecraftforge.common.util.ForgeDirection; diff --git a/common/buildcraft/core/utils/NBTUtils.java b/common/buildcraft/core/lib/utils/NBTUtils.java similarity index 97% rename from common/buildcraft/core/utils/NBTUtils.java rename to common/buildcraft/core/lib/utils/NBTUtils.java index 248e0682..e23e06d0 100644 --- a/common/buildcraft/core/utils/NBTUtils.java +++ b/common/buildcraft/core/lib/utils/NBTUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.UUID; diff --git a/common/buildcraft/core/utils/NetworkUtils.java b/common/buildcraft/core/lib/utils/NetworkUtils.java similarity index 98% rename from common/buildcraft/core/utils/NetworkUtils.java rename to common/buildcraft/core/lib/utils/NetworkUtils.java index 072e6b21..97ffaa21 100644 --- a/common/buildcraft/core/utils/NetworkUtils.java +++ b/common/buildcraft/core/lib/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/common/buildcraft/core/utils/PathFinding.java b/common/buildcraft/core/lib/utils/PathFinding.java similarity index 99% rename from common/buildcraft/core/utils/PathFinding.java rename to common/buildcraft/core/lib/utils/PathFinding.java index 793da117..f639aa1c 100755 --- a/common/buildcraft/core/utils/PathFinding.java +++ b/common/buildcraft/core/lib/utils/PathFinding.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/common/buildcraft/core/utils/PathFindingSearch.java b/common/buildcraft/core/lib/utils/PathFindingSearch.java similarity index 99% rename from common/buildcraft/core/utils/PathFindingSearch.java rename to common/buildcraft/core/lib/utils/PathFindingSearch.java index 30d07694..86e775e2 100644 --- a/common/buildcraft/core/utils/PathFindingSearch.java +++ b/common/buildcraft/core/lib/utils/PathFindingSearch.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/common/buildcraft/core/utils/RevolvingList.java b/common/buildcraft/core/lib/utils/RevolvingList.java similarity index 97% rename from common/buildcraft/core/utils/RevolvingList.java rename to common/buildcraft/core/lib/utils/RevolvingList.java index a527a6bb..5a075995 100644 --- a/common/buildcraft/core/utils/RevolvingList.java +++ b/common/buildcraft/core/lib/utils/RevolvingList.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.Collection; import java.util.Deque; diff --git a/common/buildcraft/core/utils/SessionVars.java b/common/buildcraft/core/lib/utils/SessionVars.java similarity index 95% rename from common/buildcraft/core/utils/SessionVars.java rename to common/buildcraft/core/lib/utils/SessionVars.java index 559210fc..12423bec 100644 --- a/common/buildcraft/core/utils/SessionVars.java +++ b/common/buildcraft/core/lib/utils/SessionVars.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; public final class SessionVars { diff --git a/common/buildcraft/core/utils/StringUtils.java b/common/buildcraft/core/lib/utils/StringUtils.java similarity index 95% rename from common/buildcraft/core/utils/StringUtils.java rename to common/buildcraft/core/lib/utils/StringUtils.java index 27daa610..4ece6751 100644 --- a/common/buildcraft/core/utils/StringUtils.java +++ b/common/buildcraft/core/lib/utils/StringUtils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import com.google.common.base.Splitter; diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/lib/utils/Utils.java similarity index 97% rename from common/buildcraft/core/utils/Utils.java rename to common/buildcraft/core/lib/utils/Utils.java index 6ad3789c..f0cce6b7 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/lib/utils/Utils.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.utils; +package buildcraft.core.lib.utils; import java.util.ArrayList; import java.util.Arrays; @@ -40,16 +40,16 @@ import buildcraft.api.transport.IInjectable; import buildcraft.api.transport.IPipeTile; import buildcraft.core.CompatHooks; import buildcraft.core.DefaultProps; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.IDropControlInventory; import buildcraft.core.IFramePipeConnection; import buildcraft.core.LaserData; import buildcraft.core.LaserKind; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.network.Packet; import buildcraft.core.proxy.CoreProxy; public final class Utils { diff --git a/common/buildcraft/core/network/EntityIds.java b/common/buildcraft/core/network/EntityIds.java index f4630c9a..bcf3d2e2 100644 --- a/common/buildcraft/core/network/EntityIds.java +++ b/common/buildcraft/core/network/EntityIds.java @@ -11,14 +11,6 @@ package buildcraft.core.network; public final class EntityIds { public static final int ROBOT = 10; - public static final int ROBOT_BUILDER = 11; - public static final int ROBOT_URBANISM = 12; - public static final int FRAME = 13; - public static final int ROBOT_PICKER = 14; - public static final int ENERGY_LASER = 20; - public static final int LASER = 30; - public static final int MECHANICAL_ARM = 40; - public static final int BLOCK = 50; /** * Deactivate constructor diff --git a/common/buildcraft/core/network/ISynchronizedTile.java b/common/buildcraft/core/network/ISynchronizedTile.java deleted file mode 100644 index 44d73f91..00000000 --- a/common/buildcraft/core/network/ISynchronizedTile.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.core.network; - -public interface ISynchronizedTile { - Packet getPacketUpdate(); -} diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index d98d2f65..b4becc8e 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -10,12 +10,10 @@ package buildcraft.core.proxy; import java.lang.ref.WeakReference; import java.util.List; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -23,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -38,8 +35,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import buildcraft.BuildCraftCore; import buildcraft.api.core.ICoreProxy; import buildcraft.core.CompatHooks; -import buildcraft.core.EntityBlock; -import buildcraft.core.ItemBlockBuildCraft; +import buildcraft.core.lib.EntityBlock; +import buildcraft.core.lib.items.ItemBlockBuildCraft; import buildcraft.core.LaserKind; public class CoreProxy implements ICoreProxy { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 99af9ccf..953d94c9 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -15,22 +15,24 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.INetHandler; import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import buildcraft.BuildCraftCore; -import buildcraft.core.EntityBlock; +import buildcraft.core.TileEngine; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.LaserKind; -import buildcraft.core.render.RenderEntityBlock; +import buildcraft.core.lib.engines.RenderEngine; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.lib.render.RenderEntityBlock; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingMarkers; @@ -86,6 +88,12 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(new RenderingEntityBlocks()); RenderingRegistry.registerBlockHandler(BuildCraftCore.legacyPipeModel, new RenderingEntityBlocks()); RenderingRegistry.registerBlockHandler(new RenderingMarkers()); + + //TODO Update me to grab differing trunk textures + ClientRegistry.bindTileEntitySpecialRenderer(TileEngineBase.class, new RenderEngine()); + for (int i = 0; i < BuildCraftCore.engineBlock.getEngineCount(); i++) { + RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine(TileEngine.BASE_TEXTURES[i], TileEngine.CHAMBER_TEXTURES[i], TileEngine.TRUNK_TEXTURES[i])); + } } @Override diff --git a/common/buildcraft/core/recipes/FlexibleRecipe.java b/common/buildcraft/core/recipes/FlexibleRecipe.java index 98ac2193..cdf2c2ab 100644 --- a/common/buildcraft/core/recipes/FlexibleRecipe.java +++ b/common/buildcraft/core/recipes/FlexibleRecipe.java @@ -23,9 +23,9 @@ import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.recipes.IFlexibleRecipeViewable; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public class FlexibleRecipe implements IFlexibleRecipe, IFlexibleRecipeViewable { public int energyCost = 0; diff --git a/common/buildcraft/core/render/BlockHighlightHandler.java b/common/buildcraft/core/render/BlockHighlightHandler.java index a55d2790..a8dd5009 100644 --- a/common/buildcraft/core/render/BlockHighlightHandler.java +++ b/common/buildcraft/core/render/BlockHighlightHandler.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.client.event.DrawBlockHighlightEvent; -import buildcraft.core.ICustomHighlight; +import buildcraft.core.lib.render.ICustomHighlight; public class BlockHighlightHandler { diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index ad4bd3be..8094402f 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -21,7 +21,8 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.core.Position; import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; -import buildcraft.core.render.RenderEntityBlock.RenderInfo; +import buildcraft.core.lib.render.RenderEntityBlock; +import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; public class RenderLaser extends Render { diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index 4a77dd10..fd7755d3 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -24,8 +24,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import buildcraft.BuildCraftCore; import buildcraft.core.CoreConstants; -import buildcraft.core.IInventoryRenderer; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.render.IInventoryRenderer; +import buildcraft.core.lib.utils.Utils; public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler { diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index 7877ca6c..2a671ead 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -23,7 +23,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IControllable.Mode; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionMachineControl extends BCStatement implements IActionExternal { public final Mode mode; diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index ccb70ee2..0cec118b 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; public class ActionRedstoneOutput extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 59c72782..d82c692e 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class StatementParameterDirection implements IStatementParameter { diff --git a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java index 78d6ffe3..4020bb1b 100644 --- a/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java +++ b/common/buildcraft/core/statements/StatementParameterRedstoneGateSideOnly.java @@ -9,7 +9,7 @@ import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class StatementParameterRedstoneGateSideOnly implements IStatementParameter { diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 55ecc7dd..3fa1aa43 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -25,7 +25,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TriggerEnergy extends BCStatement implements ITriggerInternal { public static class Neighbor { diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index d68b7d0f..9b17acb2 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -23,7 +23,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TriggerFluidContainer extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 98df2bea..84dd375b 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -23,7 +23,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TriggerFluidContainerLevel extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index 87f25ad8..a809dd2b 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -23,9 +23,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.ItemList; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.utils.StringUtils; public class TriggerInventory extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index f05f8a0d..8fc9b8f1 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -22,9 +22,9 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.utils.StringUtils; public class TriggerInventoryLevel extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index 89b346f1..7a885b7c 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TriggerMachine extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index 9bbd8cba..617d56d1 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -14,7 +14,7 @@ import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.TileGenericPipe; public class TriggerRedstoneInput extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/energy/EnergyProxy.java b/common/buildcraft/energy/EnergyProxy.java index f4254e8b..ef4cbde0 100644 --- a/common/buildcraft/energy/EnergyProxy.java +++ b/common/buildcraft/energy/EnergyProxy.java @@ -16,7 +16,6 @@ public class EnergyProxy { public static EnergyProxy proxy; public void registerTileEntities() { - GameRegistry.registerTileEntity(TileEngineWood.class, "net.minecraft.src.buildcraft.energy.TileEngineWood"); GameRegistry.registerTileEntity(TileEngineStone.class, "net.minecraft.src.buildcraft.energy.TileEngineStone"); GameRegistry.registerTileEntity(TileEngineIron.class, "net.minecraft.src.buildcraft.energy.TileEngineIron"); GameRegistry.registerTileEntity(TileEngineCreative.class, "net.minecraft.src.buildcraft.energy.TileEngineCreative"); diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index 474155e0..977cf8ed 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -8,28 +8,15 @@ */ package buildcraft.energy; -import cpw.mods.fml.client.registry.ClientRegistry; - -import buildcraft.BuildCraftEnergy; -import buildcraft.core.render.RenderingEntityBlocks; -import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; -import buildcraft.energy.render.RenderEngine; - public class EnergyProxyClient extends EnergyProxy { @Override public void registerTileEntities() { super.registerTileEntities(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEngine.class, new RenderEngine()); } @Override public void registerBlockRenderers() { - //RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.emitterBlock, 0), new RenderEnergyEmitter()); - //TODO Update me to grab differing trunk textures - RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 0), new RenderEngine(TileEngine.BASE_TEXTURES[0], TileEngine.CHAMBER_TEXTURES[0], TileEngine.TRUNK_BLUE_TEXTURE)); - RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 1), new RenderEngine(TileEngine.BASE_TEXTURES[1], TileEngine.CHAMBER_TEXTURES[1], TileEngine.TRUNK_BLUE_TEXTURE)); - RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 2), new RenderEngine(TileEngine.BASE_TEXTURES[2], TileEngine.CHAMBER_TEXTURES[2], TileEngine.TRUNK_BLUE_TEXTURE)); - RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 3), new RenderEngine(TileEngine.BASE_TEXTURES[3], TileEngine.CHAMBER_TEXTURES[3], TileEngine.TRUNK_TEXTURES[3])); + } } diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index c28a1b5d..10da387f 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -22,7 +22,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.tools.IToolWrench; import buildcraft.core.PowerMode; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.TileEngine; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.lib.utils.StringUtils; public class TileEngineCreative extends TileEngine { private PowerMode powerMode = PowerMode.M2; diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index e2164a37..9fc7eaaa 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -9,6 +9,7 @@ package buildcraft.energy; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,10 +31,10 @@ import buildcraft.api.fuels.IFuel; import buildcraft.api.fuels.ISolidCoolant; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; -import buildcraft.core.fluids.Tank; -import buildcraft.core.fluids.TankManager; -import buildcraft.core.fluids.TankUtils; -import buildcraft.core.inventory.InvUtils; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.fluids.TankManager; +import buildcraft.core.lib.fluids.TankUtils; +import buildcraft.core.lib.inventory.InvUtils; import buildcraft.energy.gui.ContainerEngine; public class TileEngineIron extends TileEngineWithInventory implements IFluidHandler { @@ -333,7 +334,7 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan } @Override - public void sendGUINetworkData(ContainerEngine containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { super.sendGUINetworkData(containerEngine, iCrafting); iCrafting.sendProgressBarUpdate(containerEngine, 15, tankFuel.getFluid() != null ? tankFuel.getFluid().fluidID : 0); iCrafting.sendProgressBarUpdate(containerEngine, 16, tankCoolant.getFluid() != null ? tankCoolant.getFluid().fluidID : 0); diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index dcd2acaf..11201c17 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -10,6 +10,7 @@ package buildcraft.energy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,8 +21,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftEnergy; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.utils.MathUtils; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.utils.MathUtils; import buildcraft.energy.gui.ContainerEngine; public class TileEngineStone extends TileEngineWithInventory { @@ -138,7 +139,7 @@ public class TileEngineStone extends TileEngineWithInventory { } @Override - public void sendGUINetworkData(ContainerEngine containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { super.sendGUINetworkData(containerEngine, iCrafting); iCrafting.sendProgressBarUpdate(containerEngine, 15, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, 16, totalBurnTime); diff --git a/common/buildcraft/energy/TileEngineWithInventory.java b/common/buildcraft/energy/TileEngineWithInventory.java index 5f527fb1..595bb813 100644 --- a/common/buildcraft/energy/TileEngineWithInventory.java +++ b/common/buildcraft/energy/TileEngineWithInventory.java @@ -14,8 +14,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.utils.Utils; +import buildcraft.core.TileEngine; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.utils.Utils; public abstract class TileEngineWithInventory extends TileEngine implements IInventory, ISidedInventory { diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index 4c306f13..5dba203a 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -13,7 +13,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.energy.TileEngineStone; import buildcraft.energy.TileEngineWithInventory; diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index f5b6b686..465a5726 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.energy.TileEngineIron; public class GuiCombustionEngine extends GuiEngine { diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index 7820cb80..c0ad25df 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -15,10 +15,10 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; -import buildcraft.energy.TileEngine; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.lib.engines.TileEngineBase; public abstract class GuiEngine extends GuiBuildCraft { @@ -26,12 +26,12 @@ public abstract class GuiEngine extends GuiBuildCraft { protected class EngineLedger extends Ledger { - TileEngine engine; + TileEngineBase engine; int headerColour = 0xe1c92f; int subheaderColour = 0xaaafb8; int textColour = 0x000000; - public EngineLedger(TileEngine engine) { + public EngineLedger(TileEngineBase engine) { this.engine = engine; maxHeight = 94; overlayColor = 0xd46c1f; @@ -77,7 +77,7 @@ public abstract class GuiEngine extends GuiBuildCraft { protected void initLedgers(IInventory inventory) { super.initLedgers(inventory); if (!BuildCraftCore.hidePowerNumbers) { - ledgerManager.add(new EngineLedger((TileEngine) tile)); + ledgerManager.add(new EngineLedger((TileEngineBase) tile)); } } } diff --git a/common/buildcraft/energy/gui/GuiStoneEngine.java b/common/buildcraft/energy/gui/GuiStoneEngine.java index e0095762..fcfead6f 100644 --- a/common/buildcraft/energy/gui/GuiStoneEngine.java +++ b/common/buildcraft/energy/gui/GuiStoneEngine.java @@ -14,7 +14,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.energy.TileEngineStone; public class GuiStoneEngine extends GuiEngine { diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index c878699e..808e6f37 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.energy.TileEngine; +import buildcraft.core.lib.engines.TileEngineBase; public class EnergyStatementProvider implements ITriggerProvider { @@ -33,7 +33,7 @@ public class EnergyStatementProvider implements ITriggerProvider { public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList triggers = new LinkedList(); - if (tile instanceof TileEngine) { + if (tile instanceof TileEngineBase) { triggers.add(BuildCraftEnergy.triggerBlueEngineHeat); triggers.add(BuildCraftEnergy.triggerGreenEngineHeat); triggers.add(BuildCraftEnergy.triggerYellowEngineHeat); diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 652f3a76..78bc8420 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -22,9 +22,9 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; -import buildcraft.energy.TileEngine; -import buildcraft.energy.TileEngine.EnergyStage; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.lib.engines.TileEngineBase; +import buildcraft.core.lib.engines.TileEngineBase.EnergyStage; public class TriggerEngineHeat extends BCStatement implements ITriggerExternal { @@ -43,8 +43,8 @@ public class TriggerEngineHeat extends BCStatement implements ITriggerExternal { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer container, IStatementParameter[] parameters) { - if (tile instanceof TileEngine) { - TileEngine engine = (TileEngine) tile; + if (tile instanceof TileEngineBase) { + TileEngineBase engine = (TileEngineBase) tile; return engine.getEnergyStage() == stage; } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 266cff36..58cfae1a 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftFactory; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; diff --git a/common/buildcraft/factory/BlockFloodGate.java b/common/buildcraft/factory/BlockFloodGate.java index 1fa1c80f..946fdfb3 100644 --- a/common/buildcraft/factory/BlockFloodGate.java +++ b/common/buildcraft/factory/BlockFloodGate.java @@ -21,8 +21,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.utils.Utils; public class BlockFloodGate extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 4188469f..1bad81e2 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.core.CoreConstants; import buildcraft.core.IFramePipeConnection; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockFrame extends Block implements IFramePipeConnection { diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 76f07087..635ab814 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 23775b64..e237b8e8 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -23,8 +23,8 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftFactory; -import buildcraft.core.BlockBuildCraft; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.utils.Utils; public class BlockMiningWell extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index b1777b1c..b3ec8e49 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -21,8 +21,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.utils.Utils; public class BlockPump extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 12e752b3..750cc84c 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -29,8 +29,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftFactory; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.block.BlockBuildCraft; +import buildcraft.core.lib.utils.Utils; public class BlockQuarry extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index dac5d3f7..92ebe7ee 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -30,11 +30,11 @@ import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; import buildcraft.core.GuiIds; -import buildcraft.core.fluids.TankUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.fluids.TankUtils; +import buildcraft.core.lib.utils.Utils; public class BlockRefinery extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index dc32607b..d227b164 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -28,9 +28,9 @@ import net.minecraftforge.fluids.IFluidContainerItem; import buildcraft.BuildCraftCore; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.inventory.InvUtils; +import buildcraft.core.lib.inventory.InvUtils; public class BlockTank extends BlockBuildCraft { diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index 56a1608f..3d8e73bc 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; public class EntityMechanicalArm extends Entity { diff --git a/common/buildcraft/factory/FactoryProxy.java b/common/buildcraft/factory/FactoryProxy.java index 5b50dd8e..7df2f3a9 100644 --- a/common/buildcraft/factory/FactoryProxy.java +++ b/common/buildcraft/factory/FactoryProxy.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.SidedProxy; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; public class FactoryProxy { @SidedProxy(clientSide = "buildcraft.factory.FactoryProxyClient", serverSide = "buildcraft.factory.FactoryProxy") diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 322a801c..3bb146bf 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -18,9 +18,9 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import buildcraft.BuildCraftFactory; import buildcraft.api.core.BCLog; -import buildcraft.core.EntityBlock; +import buildcraft.core.lib.EntityBlock; import buildcraft.core.render.RenderBuilder; -import buildcraft.core.render.RenderVoid; +import buildcraft.core.lib.render.RenderVoid; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; import buildcraft.factory.gui.GuiAutoCrafting; diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 91c3ffcd..80785291 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -25,15 +25,15 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryConcatenator; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryConcatenator; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.CraftingUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.CraftingUtils; +import buildcraft.core.lib.utils.Utils; public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory, IHasWork { diff --git a/common/buildcraft/factory/TileFloodGate.java b/common/buildcraft/factory/TileFloodGate.java index 6a0185b9..1a7e3709 100644 --- a/common/buildcraft/factory/TileFloodGate.java +++ b/common/buildcraft/factory/TileFloodGate.java @@ -28,11 +28,11 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.fluids.Tank; -import buildcraft.core.fluids.TankUtils; -import buildcraft.core.utils.BlockUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.fluids.TankUtils; +import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.lib.utils.Utils; public class TileFloodGate extends TileBuildCraft implements IFluidHandler { diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index f0b68a1a..a6e4ecef 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -19,11 +19,11 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.transport.IInjectable; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.Transactor; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.Transactor; public class TileHopper extends TileBuildCraft implements IInventory, IEnergyHandler, IRedstoneEngineReceiver { diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 4e885ee3..968a369c 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -18,9 +18,10 @@ import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.utils.BlockMiner; +import buildcraft.core.lib.utils.BlockUtils; public class TileMiningWell extends TileBuildCraft implements IHasWork, IPipeConnection, IControllable { boolean isDigging = true; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 26b9a090..134a9a95 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -35,15 +35,15 @@ import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.tiles.IHasWork; import buildcraft.core.CoreConstants; -import buildcraft.core.EntityBlock; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuffer; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.fluids.SingleUseTank; -import buildcraft.core.fluids.TankUtils; +import buildcraft.core.lib.EntityBlock; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.fluids.SingleUseTank; +import buildcraft.core.lib.fluids.TankUtils; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.lib.utils.Utils; public class TilePump extends TileBuildCraft implements IHasWork, IFluidHandler, IRedstoneEngineReceiver { diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 5ae4de31..639eddc1 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -49,15 +49,16 @@ import buildcraft.core.Box.Kind; import buildcraft.core.CoreConstants; import buildcraft.core.DefaultAreaProvider; import buildcraft.core.IDropControlInventory; -import buildcraft.core.RFBattery; +import buildcraft.core.lib.RFBattery; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BptBuilderBase; import buildcraft.core.blueprints.BptBuilderBlueprint; import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.BlockMiner; +import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.lib.utils.Utils; public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory, IPipeConnection, IControllable { diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 3d60c3ee..c6092b22 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -29,13 +29,12 @@ import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.fluids.SingleUseTank; -import buildcraft.core.fluids.TankManager; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.fluids.SingleUseTank; +import buildcraft.core.lib.fluids.TankManager; import buildcraft.core.recipes.RefineryRecipeManager; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.NetworkUtils; public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInventory, IHasWork, IFlexibleCrafter { diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 3c65ff31..48749287 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -24,9 +24,9 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftCore; import buildcraft.api.core.SafeTimeTracker; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.fluids.Tank; -import buildcraft.core.fluids.TankManager; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.fluids.TankManager; public class TileTank extends TileBuildCraft implements IFluidHandler { diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index 5534cf9f..ad907a05 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -17,12 +17,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; -import buildcraft.core.gui.slots.SlotUntouchable; -import buildcraft.core.gui.slots.SlotWorkbench; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; +import buildcraft.core.lib.gui.slots.SlotUntouchable; +import buildcraft.core.lib.gui.slots.SlotWorkbench; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.factory.TileAutoWorkbench; public class ContainerAutoWorkbench extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/ContainerHopper.java b/common/buildcraft/factory/gui/ContainerHopper.java index 2a04a20f..272fdf79 100644 --- a/common/buildcraft/factory/gui/ContainerHopper.java +++ b/common/buildcraft/factory/gui/ContainerHopper.java @@ -13,7 +13,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.factory.TileHopper; public class ContainerHopper extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index ec79a1ea..67d4a015 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -19,10 +19,10 @@ import net.minecraftforge.fluids.Fluid; import buildcraft.BuildCraftFactory; import buildcraft.api.core.ISerializable; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.core.network.PacketIds; -import buildcraft.core.network.PacketUpdate; -import buildcraft.core.network.Serializable; +import buildcraft.core.lib.network.PacketUpdate; +import buildcraft.core.lib.network.Serializable; import buildcraft.factory.TileRefinery; public class ContainerRefinery extends BuildCraftContainer { diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index 58a1f406..e92544d6 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.factory.TileAutoWorkbench; public class GuiAutoCrafting extends GuiBuildCraft { diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 5626e0f1..5e944563 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -19,9 +19,9 @@ import net.minecraftforge.fluids.FluidStack; import buildcraft.api.recipes.CraftingResult; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.FluidSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.FluidSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.factory.TileRefinery; public class GuiRefinery extends GuiAdvancedInterface { diff --git a/common/buildcraft/factory/network/PacketHandlerFactory.java b/common/buildcraft/factory/network/PacketHandlerFactory.java index b4316fc3..1e388b9b 100644 --- a/common/buildcraft/factory/network/PacketHandlerFactory.java +++ b/common/buildcraft/factory/network/PacketHandlerFactory.java @@ -24,9 +24,9 @@ import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraftforge.fluids.FluidRegistry; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; -import buildcraft.core.network.PacketUpdate; +import buildcraft.core.lib.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.factory.TileRefinery; diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index 9464726d..dc606dae 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -21,7 +21,7 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.core.DefaultProps; -import buildcraft.core.IInventoryRenderer; +import buildcraft.core.lib.render.IInventoryRenderer; public class RenderHopper extends TileEntitySpecialRenderer implements IInventoryRenderer { diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index c034348d..5719404e 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -20,10 +20,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; import buildcraft.core.DefaultProps; -import buildcraft.core.IInventoryRenderer; -import buildcraft.core.fluids.Tank; -import buildcraft.core.render.FluidRenderer; -import buildcraft.core.render.RenderUtils; +import buildcraft.core.lib.render.IInventoryRenderer; +import buildcraft.core.lib.fluids.Tank; +import buildcraft.core.lib.render.FluidRenderer; +import buildcraft.core.lib.render.RenderUtils; import buildcraft.factory.TileRefinery; public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer { diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 0606e10c..e0e28f04 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -15,8 +15,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; -import buildcraft.core.render.FluidRenderer; -import buildcraft.core.render.RenderUtils; +import buildcraft.core.lib.render.FluidRenderer; +import buildcraft.core.lib.render.RenderUtils; import buildcraft.factory.TileTank; public class RenderTank extends TileEntitySpecialRenderer { diff --git a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java index c16dbc36..88bdc0cb 100644 --- a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java +++ b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java @@ -19,7 +19,7 @@ import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; import buildcraft.api.core.IInvSlot; import buildcraft.api.core.JavaTools; -import buildcraft.core.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.factory.TileAutoWorkbench; public class SchematicAutoWorkbench extends SchematicTile { diff --git a/common/buildcraft/robotics/BlockRequester.java b/common/buildcraft/robotics/BlockRequester.java index 0188e68f..997b26da 100755 --- a/common/buildcraft/robotics/BlockRequester.java +++ b/common/buildcraft/robotics/BlockRequester.java @@ -25,9 +25,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftRobotics; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockRequester extends BlockBuildCraft { diff --git a/common/buildcraft/robotics/BlockZonePlan.java b/common/buildcraft/robotics/BlockZonePlan.java index 959af837..7b02bbf0 100755 --- a/common/buildcraft/robotics/BlockZonePlan.java +++ b/common/buildcraft/robotics/BlockZonePlan.java @@ -25,9 +25,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftRobotics; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockZonePlan extends BlockBuildCraft { diff --git a/common/buildcraft/robotics/BoardProgrammingRecipe.java b/common/buildcraft/robotics/BoardProgrammingRecipe.java index 54fba709..489e8c66 100644 --- a/common/buildcraft/robotics/BoardProgrammingRecipe.java +++ b/common/buildcraft/robotics/BoardProgrammingRecipe.java @@ -6,11 +6,10 @@ import java.util.Comparator; import java.util.List; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftRobotics; -import buildcraft.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.recipes.IProgrammingRecipe; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.utils.NBTUtils; public class BoardProgrammingRecipe implements IProgrammingRecipe { private class BoardSorter implements Comparator { diff --git a/common/buildcraft/robotics/EntityRobot.java b/common/buildcraft/robotics/EntityRobot.java index 28c22071..fb3cd309 100644 --- a/common/buildcraft/robotics/EntityRobot.java +++ b/common/buildcraft/robotics/EntityRobot.java @@ -44,7 +44,6 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftRobotics; -import buildcraft.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.boards.RedstoneBoardRobot; @@ -58,12 +57,12 @@ import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.RobotManager; import buildcraft.core.DefaultProps; import buildcraft.core.LaserData; -import buildcraft.core.RFBattery; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NBTUtils; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NBTUtils; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.robotics.ai.AIRobotMain; import buildcraft.robotics.statements.ActionRobotWorkInArea; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/robotics/ItemRedstoneBoard.java b/common/buildcraft/robotics/ItemRedstoneBoard.java index a8b890c8..4b1f5cb5 100755 --- a/common/buildcraft/robotics/ItemRedstoneBoard.java +++ b/common/buildcraft/robotics/ItemRedstoneBoard.java @@ -25,8 +25,8 @@ import buildcraft.BuildCraftRobotics; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.NBTUtils; public class ItemRedstoneBoard extends ItemBuildCraft { diff --git a/common/buildcraft/robotics/ItemRobot.java b/common/buildcraft/robotics/ItemRobot.java index 72b3c32a..97178f7c 100755 --- a/common/buildcraft/robotics/ItemRobot.java +++ b/common/buildcraft/robotics/ItemRobot.java @@ -32,8 +32,8 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.events.RobotPlacementEvent; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.NBTUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/robotics/ItemRobotStation.java b/common/buildcraft/robotics/ItemRobotStation.java index 1842f511..06b31e29 100755 --- a/common/buildcraft/robotics/ItemRobotStation.java +++ b/common/buildcraft/robotics/ItemRobotStation.java @@ -22,7 +22,7 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemRobotStation extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/robotics/RobotStationPluggable.java b/common/buildcraft/robotics/RobotStationPluggable.java index 10cf56e1..54cabeaa 100644 --- a/common/buildcraft/robotics/RobotStationPluggable.java +++ b/common/buildcraft/robotics/RobotStationPluggable.java @@ -19,7 +19,7 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/robotics/TileRequester.java b/common/buildcraft/robotics/TileRequester.java index 4195a7b7..5f91dc20 100755 --- a/common/buildcraft/robotics/TileRequester.java +++ b/common/buildcraft/robotics/TileRequester.java @@ -22,13 +22,13 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.RobotManager; import buildcraft.api.robots.StackRequest; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.api.robots.ResourceIdRequest; public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver { diff --git a/common/buildcraft/robotics/TileZonePlan.java b/common/buildcraft/robotics/TileZonePlan.java index 35265d76..fe8c280a 100644 --- a/common/buildcraft/robotics/TileZonePlan.java +++ b/common/buildcraft/robotics/TileZonePlan.java @@ -19,9 +19,9 @@ import net.minecraft.world.chunk.Chunk; import buildcraft.api.core.SafeTimeTracker; import buildcraft.core.ItemMapLocation; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.core.ZonePlan; -import buildcraft.core.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.SimpleInventory; public class TileZonePlan extends TileBuildCraft implements IInventory { diff --git a/common/buildcraft/robotics/ai/AIRobotBreak.java b/common/buildcraft/robotics/ai/AIRobotBreak.java index 3a0fcc3f..2daafb15 100644 --- a/common/buildcraft/robotics/ai/AIRobotBreak.java +++ b/common/buildcraft/robotics/ai/AIRobotBreak.java @@ -20,7 +20,7 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.utils.BlockUtils; public class AIRobotBreak extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java index 40f5cc5a..32ae7e06 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java @@ -22,14 +22,14 @@ import buildcraft.api.recipes.CraftingResult; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.RobotManager; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryCopy; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryCopy; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.silicon.ResourceIdAssemblyTable; diff --git a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java index a430e137..12e3c931 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java @@ -19,12 +19,12 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.api.robots.ResourceIdBlock; diff --git a/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java b/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java index b2b67918..4ef1d2af 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftGeneric.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; public abstract class AIRobotCraftGeneric extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java index 1b460a83..580deed8 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java @@ -28,13 +28,13 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InventoryCopy; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.ArrayStackOrListFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InventoryCopy; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionRobotFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java index ec9c54c1..b6549230 100755 --- a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java +++ b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java @@ -16,8 +16,8 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.filters.ArrayStackOrListFilter; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionStationRequestItemsMachine; diff --git a/common/buildcraft/robotics/ai/AIRobotDisposeItems.java b/common/buildcraft/robotics/ai/AIRobotDisposeItems.java index 6ada843d..87ebae97 100755 --- a/common/buildcraft/robotics/ai/AIRobotDisposeItems.java +++ b/common/buildcraft/robotics/ai/AIRobotDisposeItems.java @@ -13,7 +13,7 @@ import net.minecraft.entity.item.EntityItem; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.InventoryIterator; public class AIRobotDisposeItems extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java index ea3d3112..946d72c9 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java @@ -16,10 +16,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.AggregateFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.AggregateFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.statements.ActionRobotFilterTool; diff --git a/common/buildcraft/robotics/ai/AIRobotFetchItem.java b/common/buildcraft/robotics/ai/AIRobotFetchItem.java index a8f31315..9f196955 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchItem.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchItem.java @@ -16,8 +16,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.TransactorSimple; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.TransactorSimple; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.boards.BoardRobotPicker; public class AIRobotFetchItem extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java index 15e9af31..b94dd2cb 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java @@ -17,8 +17,8 @@ import net.minecraftforge.common.util.Constants; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.IterableAlgorithmRunner; -import buildcraft.core.utils.PathFinding; +import buildcraft.core.lib.utils.IterableAlgorithmRunner; +import buildcraft.core.lib.utils.PathFinding; public class AIRobotGotoBlock extends AIRobotGoto { diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java index 7cea220a..5e97e09d 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java @@ -11,7 +11,7 @@ package buildcraft.robotics.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public class AIRobotGotoStationAndLoad extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java index a702d9a0..a781f825 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java @@ -11,7 +11,7 @@ package buildcraft.robotics.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IFluidFilter; +import buildcraft.core.lib.inventory.filters.IFluidFilter; public class AIRobotGotoStationAndLoadFluids extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java index 3dbcfc8f..d1944e37 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java @@ -16,9 +16,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionRobotFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java index 2d342a0b..5a61db79 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IFluidFilter; +import buildcraft.core.lib.inventory.filters.IFluidFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionRobotFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java index ead6bdf9..42abd9f0 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java @@ -14,7 +14,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.IStationFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java index 0d5ff35f..b55b0f3d 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.SimpleFluidFilter; +import buildcraft.core.lib.inventory.filters.SimpleFluidFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionRobotFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotLoad.java b/common/buildcraft/robotics/ai/AIRobotLoad.java index 299ca1c2..1236b420 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotLoad.java @@ -17,10 +17,10 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationProvideItems; diff --git a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java index ec746151..20495b7e 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IFluidFilter; +import buildcraft.core.lib.inventory.filters.IFluidFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationProvideFluids; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchBlock.java b/common/buildcraft/robotics/ai/AIRobotSearchBlock.java index 41259145..40cd5854 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchBlock.java @@ -9,8 +9,8 @@ package buildcraft.robotics.ai; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.BlockScannerExpanding; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.utils.BlockScannerExpanding; +import buildcraft.core.lib.utils.IBlockFilter; public class AIRobotSearchBlock extends AIRobotSearchBlockBase { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java b/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java index 829b8b2d..16f34732 100644 --- a/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchBlockBase.java @@ -8,9 +8,9 @@ import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.IBlockFilter; -import buildcraft.core.utils.IterableAlgorithmRunner; -import buildcraft.core.utils.PathFindingSearch; +import buildcraft.core.lib.utils.IBlockFilter; +import buildcraft.core.lib.utils.IterableAlgorithmRunner; +import buildcraft.core.lib.utils.PathFindingSearch; import buildcraft.api.robots.ResourceIdBlock; public class AIRobotSearchBlockBase extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java index d725b118..e3ba3342 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java @@ -13,8 +13,8 @@ import net.minecraft.entity.Entity; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.TransactorSimple; -import buildcraft.core.utils.IEntityFilter; +import buildcraft.core.lib.inventory.TransactorSimple; +import buildcraft.core.lib.utils.IEntityFilter; public class AIRobotSearchEntity extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java b/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java index 5aec13ed..e239fe96 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchRandomBlock.java @@ -13,9 +13,9 @@ import java.util.Iterator; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.BlockScannerRandom; -import buildcraft.core.utils.BlockScannerZoneRandom; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.utils.BlockScannerRandom; +import buildcraft.core.lib.utils.BlockScannerZoneRandom; +import buildcraft.core.lib.utils.IBlockFilter; public class AIRobotSearchRandomBlock extends AIRobotSearchBlockBase { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java index eb1467cd..023e5688 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java @@ -12,7 +12,7 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.utils.IBlockFilter; public class AIRobotSearchRandomGroundBlock extends AIRobot { diff --git a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java index 0a7fb84b..222b5343 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java @@ -21,8 +21,8 @@ import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.IStationFilter; import buildcraft.robotics.statements.ActionRobotFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java index b3141310..1d0b8a7e 100644 --- a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java +++ b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java @@ -22,7 +22,7 @@ import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesHandler.StripesHandlerType; import buildcraft.api.transport.PipeManager; -import buildcraft.core.inventory.InvUtils; +import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.proxy.CoreProxy; public class AIRobotStripesHandler extends AIRobot implements IStripesActivator { diff --git a/common/buildcraft/robotics/ai/AIRobotUnload.java b/common/buildcraft/robotics/ai/AIRobotUnload.java index 84ac0159..b5153b9d 100755 --- a/common/buildcraft/robotics/ai/AIRobotUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotUnload.java @@ -13,7 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.InventoryIterator; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.statements.ActionStationInputItems; diff --git a/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java index 4fd2698c..daecb8ba 100755 --- a/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotUnloadFluids.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.SimpleFluidFilter; +import buildcraft.core.lib.inventory.filters.SimpleFluidFilter; import buildcraft.robotics.DockingStation; import buildcraft.robotics.statements.ActionRobotFilter; import buildcraft.robotics.statements.ActionStationAcceptFluids; diff --git a/common/buildcraft/robotics/boards/BoardRobotBomber.java b/common/buildcraft/robotics/boards/BoardRobotBomber.java index 5c247a1a..c5943f67 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomber.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomber.java @@ -20,11 +20,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoStationToLoad; import buildcraft.robotics.ai.AIRobotLoad; diff --git a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java index f3d9a278..faeed17a 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomberNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotBomberNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotBuilder.java b/common/buildcraft/robotics/boards/BoardRobotBuilder.java index a21a2abf..f14c8006 100644 --- a/common/buildcraft/robotics/boards/BoardRobotBuilder.java +++ b/common/buildcraft/robotics/boards/BoardRobotBuilder.java @@ -20,7 +20,7 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.builders.TileConstructionMarker; import buildcraft.core.builders.BuildingItem; import buildcraft.core.builders.BuildingSlot; -import buildcraft.core.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; import buildcraft.robotics.ai.AIRobotGotoBlock; import buildcraft.robotics.ai.AIRobotGotoSleep; import buildcraft.robotics.ai.AIRobotGotoStationToLoad; diff --git a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java index 579c1e23..7a536ef5 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotBuilderNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotBuilderNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotButcher.java b/common/buildcraft/robotics/boards/BoardRobotButcher.java index 11a38b82..be03518f 100755 --- a/common/buildcraft/robotics/boards/BoardRobotButcher.java +++ b/common/buildcraft/robotics/boards/BoardRobotButcher.java @@ -17,8 +17,8 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IEntityFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IEntityFilter; import buildcraft.robotics.ai.AIRobotAttack; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoSleep; diff --git a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java index 3d82eabb..f700bccf 100755 --- a/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotButcherNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotButcherNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java index 9aa4618e..2b2ff420 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCarrierNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotCarrierNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafter.java b/common/buildcraft/robotics/boards/BoardRobotCrafter.java index b3d5fddd..492ea10f 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafter.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafter.java @@ -30,7 +30,7 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.StackRequest; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.robotics.ai.AIRobotCraftAssemblyTable; import buildcraft.robotics.ai.AIRobotCraftFurnace; diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java index 8a79b594..df188efe 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafterNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotCrafterNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotDelivery.java b/common/buildcraft/robotics/boards/BoardRobotDelivery.java index 6c7dc68a..07c793a1 100755 --- a/common/buildcraft/robotics/boards/BoardRobotDelivery.java +++ b/common/buildcraft/robotics/boards/BoardRobotDelivery.java @@ -17,8 +17,8 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.StackRequest; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.robotics.ai.AIRobotDeliverRequested; import buildcraft.robotics.ai.AIRobotDisposeItems; import buildcraft.robotics.ai.AIRobotGotoSleep; diff --git a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java index 5597749a..efadba49 100755 --- a/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotDeliveryNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotDeliveryNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotFarmer.java b/common/buildcraft/robotics/boards/BoardRobotFarmer.java index 37af7885..d9ed34b2 100644 --- a/common/buildcraft/robotics/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robotics/boards/BoardRobotFarmer.java @@ -20,8 +20,8 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IWorldProperty; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; diff --git a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java index b7c33d69..75ea9912 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFarmerNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotFarmerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java index e8924b22..223a2ea4 100755 --- a/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotFluidCarrierNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotFluidCarrierNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java index f08372e2..9a26a9e0 100644 --- a/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java @@ -22,8 +22,8 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.robotics.DockingStation; import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotBreak; diff --git a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java index bd40877a..23fba363 100755 --- a/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotHarvesterNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotHarvesterNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotKnight.java b/common/buildcraft/robotics/boards/BoardRobotKnight.java index 592ce959..63b01347 100755 --- a/common/buildcraft/robotics/boards/BoardRobotKnight.java +++ b/common/buildcraft/robotics/boards/BoardRobotKnight.java @@ -17,8 +17,8 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IEntityFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IEntityFilter; import buildcraft.robotics.ai.AIRobotAttack; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoSleep; diff --git a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java index 54ac881e..369528a7 100755 --- a/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotKnightNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotKnightNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java index 139e9dab..32d888a4 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLeaveCutterNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotLeaveCutterNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java index e643c3db..4b00e50d 100755 --- a/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotLumberjackNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotLumberjackNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java index e65f15e6..e51e0cc9 100755 --- a/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotMinerNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotMinerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java index 45ef2875..77075f77 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java @@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.EntityRobot; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotPlanter.java b/common/buildcraft/robotics/boards/BoardRobotPlanter.java index 2e263a0e..032e14a3 100644 --- a/common/buildcraft/robotics/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robotics/boards/BoardRobotPlanter.java @@ -27,11 +27,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.inventory.filters.ArrayStackOrListFilter; -import buildcraft.core.inventory.filters.CompositeFilter; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; +import buildcraft.core.lib.inventory.filters.CompositeFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; diff --git a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java index f4c743b9..d102c3da 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPlanterNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotPlanterNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotPump.java b/common/buildcraft/robotics/boards/BoardRobotPump.java index a0aa3d37..123394d6 100644 --- a/common/buildcraft/robotics/boards/BoardRobotPump.java +++ b/common/buildcraft/robotics/boards/BoardRobotPump.java @@ -29,7 +29,7 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.robotics.DockingStation; import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotGotoBlock; diff --git a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java index e433005e..57e38419 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPumpNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotPumpNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java index 2e375661..35bcc205 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelmanNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotShovelmanNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/boards/BoardRobotStripes.java b/common/buildcraft/robotics/boards/BoardRobotStripes.java index 9eb92b5b..cd78956b 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripes.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripes.java @@ -17,8 +17,8 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.utils.IBlockFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.utils.IBlockFilter; import buildcraft.api.robots.ResourceIdBlock; import buildcraft.robotics.ai.AIRobotFetchAndEquipItemStack; import buildcraft.robotics.ai.AIRobotGotoBlock; diff --git a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java index 213e2de7..368f64f3 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripesNBT.java @@ -21,7 +21,7 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class BoardRobotStripesNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robotics/gui/ContainerRequester.java b/common/buildcraft/robotics/gui/ContainerRequester.java index c128b74e..8462341e 100755 --- a/common/buildcraft/robotics/gui/ContainerRequester.java +++ b/common/buildcraft/robotics/gui/ContainerRequester.java @@ -18,11 +18,11 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import buildcraft.BuildCraftCore; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.robotics.TileRequester; public class ContainerRequester extends BuildCraftContainer implements ICommandReceiver { diff --git a/common/buildcraft/robotics/gui/ContainerZonePlan.java b/common/buildcraft/robotics/gui/ContainerZonePlan.java index f32496dc..90df8c3a 100755 --- a/common/buildcraft/robotics/gui/ContainerZonePlan.java +++ b/common/buildcraft/robotics/gui/ContainerZonePlan.java @@ -18,18 +18,18 @@ import net.minecraft.inventory.Slot; import cpw.mods.fml.relauncher.Side; import buildcraft.BuildCraftCore; -import buildcraft.core.render.BCDynamicTexture; +import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.ZonePlan; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.robotics.TileZonePlan; public class ContainerZonePlan extends BuildCraftContainer implements ICommandReceiver { - public BCDynamicTexture mapTexture; + public DynamicTexturePaletted mapTexture; public ZonePlan currentAreaSelection; public GuiZonePlan gui; diff --git a/common/buildcraft/robotics/gui/GuiRequester.java b/common/buildcraft/robotics/gui/GuiRequester.java index 66b34e58..f17d2463 100755 --- a/common/buildcraft/robotics/gui/GuiRequester.java +++ b/common/buildcraft/robotics/gui/GuiRequester.java @@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; import buildcraft.robotics.TileRequester; public class GuiRequester extends GuiAdvancedInterface { diff --git a/common/buildcraft/robotics/gui/GuiZonePlan.java b/common/buildcraft/robotics/gui/GuiZonePlan.java index 2d0a10d0..2469b604 100755 --- a/common/buildcraft/robotics/gui/GuiZonePlan.java +++ b/common/buildcraft/robotics/gui/GuiZonePlan.java @@ -24,17 +24,17 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.api.core.EnumColor; -import buildcraft.core.render.BCDynamicTexture; +import buildcraft.core.lib.render.DynamicTexturePaletted; import buildcraft.core.DefaultProps; import buildcraft.core.ZonePlan; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.buttons.GuiBetterButton; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.buttons.GuiBetterButton; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.TileZonePlan; public class GuiZonePlan extends GuiAdvancedInterface { @@ -47,7 +47,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { private TileZonePlan zonePlan; - private BCDynamicTexture newSelection; + private DynamicTexturePaletted newSelection; private int selX1 = 0; private int selX2 = 0; private int selY1 = 0; @@ -55,7 +55,7 @@ public class GuiZonePlan extends GuiAdvancedInterface { private boolean inSelection = false; - private BCDynamicTexture currentSelection; + private DynamicTexturePaletted currentSelection; private int mapXMin = 0; private int mapYMin = 0; @@ -104,13 +104,13 @@ public class GuiZonePlan extends GuiAdvancedInterface { zonePlan = iZonePlan; - getContainer().mapTexture = new BCDynamicTexture(mapWidth, mapHeight); + getContainer().mapTexture = new DynamicTexturePaletted(mapWidth, mapHeight); getContainer().mapTexture.createDynamicTexture(); - currentSelection = new BCDynamicTexture(mapWidth, mapHeight); + currentSelection = new DynamicTexturePaletted(mapWidth, mapHeight); currentSelection.createDynamicTexture(); - newSelection = new BCDynamicTexture(1, 1); + newSelection = new DynamicTexturePaletted(1, 1); newSelection.createDynamicTexture(); getContainer().currentAreaSelection = new ZonePlan(); @@ -310,10 +310,10 @@ public class GuiZonePlan extends GuiAdvancedInterface { mapWidth = 200; mapHeight = 100; - getContainer().mapTexture = new BCDynamicTexture(mapWidth, mapHeight); + getContainer().mapTexture = new DynamicTexturePaletted(mapWidth, mapHeight); getContainer().mapTexture.createDynamicTexture(); - currentSelection = new BCDynamicTexture(mapWidth, mapHeight); + currentSelection = new DynamicTexturePaletted(mapWidth, mapHeight); currentSelection.createDynamicTexture(); uploadMap(); @@ -324,10 +324,10 @@ public class GuiZonePlan extends GuiAdvancedInterface { mapWidth = this.mc.displayWidth; mapHeight = this.mc.displayHeight; - getContainer().mapTexture = new BCDynamicTexture(mapWidth, mapHeight); + getContainer().mapTexture = new DynamicTexturePaletted(mapWidth, mapHeight); getContainer().mapTexture.createDynamicTexture(); - currentSelection = new BCDynamicTexture(mapWidth, mapHeight); + currentSelection = new DynamicTexturePaletted(mapWidth, mapHeight); currentSelection.createDynamicTexture(); uploadMap(); diff --git a/common/buildcraft/robotics/render/RenderRobot.java b/common/buildcraft/robotics/render/RenderRobot.java index 72e9f99a..9660c42e 100644 --- a/common/buildcraft/robotics/render/RenderRobot.java +++ b/common/buildcraft/robotics/render/RenderRobot.java @@ -27,11 +27,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import buildcraft.BuildCraftRobotics; -import buildcraft.BuildCraftSilicon; import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; import buildcraft.core.render.RenderLaser; -import buildcraft.core.render.RenderUtils; +import buildcraft.core.lib.render.RenderUtils; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.ItemRobot; diff --git a/common/buildcraft/robotics/statements/ActionRobotFilter.java b/common/buildcraft/robotics/statements/ActionRobotFilter.java index f022a1a9..2c5b459d 100755 --- a/common/buildcraft/robotics/statements/ActionRobotFilter.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilter.java @@ -22,15 +22,15 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.filters.ArrayFluidFilter; -import buildcraft.core.inventory.filters.ArrayStackOrListFilter; -import buildcraft.core.inventory.filters.IFluidFilter; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.inventory.filters.PassThroughFluidFilter; -import buildcraft.core.inventory.filters.PassThroughStackFilter; -import buildcraft.core.inventory.filters.StatementParameterStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayFluidFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; +import buildcraft.core.lib.inventory.filters.IFluidFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.PassThroughFluidFilter; +import buildcraft.core.lib.inventory.filters.PassThroughStackFilter; +import buildcraft.core.lib.inventory.filters.StatementParameterStackFilter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; diff --git a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java index f6ce4e12..c7286a6a 100644 --- a/common/buildcraft/robotics/statements/ActionRobotFilterTool.java +++ b/common/buildcraft/robotics/statements/ActionRobotFilterTool.java @@ -19,11 +19,11 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.filters.ArrayStackOrListFilter; -import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.inventory.filters.PassThroughStackFilter; +import buildcraft.core.lib.inventory.filters.ArrayStackOrListFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.PassThroughStackFilter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java index 26312ca8..8913e55d 100644 --- a/common/buildcraft/robotics/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robotics/statements/ActionRobotGotoStation.java @@ -23,7 +23,7 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.api.transport.IPipeTile; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.RobotRegistry; diff --git a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java index 060b41ed..c96b822e 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robotics/statements/ActionRobotWakeUp.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionRobotWakeUp extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java index abd49a50..5ab984c3 100755 --- a/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/robotics/statements/ActionRobotWorkInArea.java @@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; public class ActionRobotWorkInArea extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java index 2040e4a2..73a457e7 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptFluids.java @@ -15,7 +15,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionStationAcceptFluids extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java index da16fc76..55f9da1f 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptItemsInv.java @@ -18,9 +18,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java index 87c2ec2f..37587082 100755 --- a/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robotics/statements/ActionStationAcceptItemsPipe.java @@ -13,7 +13,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java index 7a6a566a..3756515e 100755 --- a/common/buildcraft/robotics/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/robotics/statements/ActionStationAllowCraft.java @@ -15,7 +15,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionStationAllowCraft extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java index f0bff70c..e88c254d 100755 --- a/common/buildcraft/robotics/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robotics/statements/ActionStationForbidRobot.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.ItemRobot; import buildcraft.transport.gates.ActionIterator; diff --git a/common/buildcraft/robotics/statements/ActionStationInputItems.java b/common/buildcraft/robotics/statements/ActionStationInputItems.java index 73e99187..f5cc15fa 100755 --- a/common/buildcraft/robotics/statements/ActionStationInputItems.java +++ b/common/buildcraft/robotics/statements/ActionStationInputItems.java @@ -12,7 +12,7 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; -import buildcraft.core.inventory.filters.StatementParameterStackFilter; +import buildcraft.core.lib.inventory.filters.StatementParameterStackFilter; import buildcraft.core.statements.BCStatement; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; diff --git a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java index f3288557..d6bd0565 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideFluids.java @@ -15,7 +15,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionStationProvideFluids extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationProvideItems.java b/common/buildcraft/robotics/statements/ActionStationProvideItems.java index 94b664ec..0125d51e 100755 --- a/common/buildcraft/robotics/statements/ActionStationProvideItems.java +++ b/common/buildcraft/robotics/statements/ActionStationProvideItems.java @@ -15,7 +15,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionStationProvideItems extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItems.java b/common/buildcraft/robotics/statements/ActionStationRequestItems.java index be5745f9..7c0c0d71 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItems.java @@ -18,9 +18,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java index cef5ee06..909759cd 100755 --- a/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionStationRequestItemsMachine extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robotics/statements/StateStationProvideItems.java b/common/buildcraft/robotics/statements/StateStationProvideItems.java index a54c47a3..941ce027 100755 --- a/common/buildcraft/robotics/statements/StateStationProvideItems.java +++ b/common/buildcraft/robotics/statements/StateStationProvideItems.java @@ -13,7 +13,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import buildcraft.api.statements.ActionState; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public class StateStationProvideItems extends ActionState { diff --git a/common/buildcraft/robotics/statements/StateStationRequestItems.java b/common/buildcraft/robotics/statements/StateStationRequestItems.java index 0ac993ca..eb9248b6 100755 --- a/common/buildcraft/robotics/statements/StateStationRequestItems.java +++ b/common/buildcraft/robotics/statements/StateStationRequestItems.java @@ -13,7 +13,7 @@ import java.util.LinkedList; import net.minecraft.item.ItemStack; import buildcraft.api.statements.ActionState; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; public class StateStationRequestItems extends ActionState { diff --git a/common/buildcraft/robotics/statements/TriggerRobotSleep.java b/common/buildcraft/robotics/statements/TriggerRobotSleep.java index b6a91742..df9e867d 100755 --- a/common/buildcraft/robotics/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robotics/statements/TriggerRobotSleep.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.IPipeTile; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.robotics.DockingStation; import buildcraft.robotics.EntityRobot; import buildcraft.robotics.RobotUtils; diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index a0a95060..3f20db37 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -27,9 +27,9 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ICustomHighlight; +import buildcraft.core.lib.render.ICustomHighlight; public class BlockLaser extends BlockBuildCraft implements ICustomHighlight { diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 06e07b2f..952806f6 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -28,9 +28,9 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftSilicon; import buildcraft.api.events.BlockInteractionEvent; import buildcraft.api.power.ILaserTargetBlock; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.BCCreativeTab; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.Utils; public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBlock { protected static final int TABLE_MAX = 5; diff --git a/common/buildcraft/silicon/ItemLaserTable.java b/common/buildcraft/silicon/ItemLaserTable.java index 947a9ad8..36170856 100644 --- a/common/buildcraft/silicon/ItemLaserTable.java +++ b/common/buildcraft/silicon/ItemLaserTable.java @@ -11,7 +11,7 @@ package buildcraft.silicon; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import buildcraft.core.ItemBlockBuildCraft; +import buildcraft.core.lib.items.ItemBlockBuildCraft; public class ItemLaserTable extends ItemBlockBuildCraft { diff --git a/common/buildcraft/silicon/ItemRedstoneChipset.java b/common/buildcraft/silicon/ItemRedstoneChipset.java index 1a4b557f..e581b293 100644 --- a/common/buildcraft/silicon/ItemRedstoneChipset.java +++ b/common/buildcraft/silicon/ItemRedstoneChipset.java @@ -22,7 +22,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftSilicon; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemRedstoneChipset extends ItemBuildCraft { diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index ccb2eb9e..692c9270 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -34,21 +34,21 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.BuildCraftSilicon; import buildcraft.api.core.IInvSlot; import buildcraft.api.power.ILaserTarget; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryCopy; -import buildcraft.core.inventory.InventoryIterator; -import buildcraft.core.inventory.InventoryMapper; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.CraftingFilter; -import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryCopy; +import buildcraft.core.lib.inventory.InventoryIterator; +import buildcraft.core.lib.inventory.InventoryMapper; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.CraftingFilter; +import buildcraft.core.lib.inventory.filters.IStackFilter; import buildcraft.core.network.PacketIds; -import buildcraft.core.network.PacketSlotChange; +import buildcraft.core.lib.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.CraftingUtils; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.CraftingUtils; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.lib.utils.Utils; public class TileAdvancedCraftingTable extends TileLaserTableBase implements IInventory, ILaserTarget, ISidedInventory { diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 7d39363e..12bf7acd 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -34,13 +34,13 @@ import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.RobotManager; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; import buildcraft.core.recipes.AssemblyRecipeManager; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.lib.utils.Utils; public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver { public String currentRecipeId = ""; diff --git a/common/buildcraft/silicon/TileChargingTable.java b/common/buildcraft/silicon/TileChargingTable.java index 5b54f9d6..44bdd2e9 100644 --- a/common/buildcraft/silicon/TileChargingTable.java +++ b/common/buildcraft/silicon/TileChargingTable.java @@ -7,7 +7,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cofh.api.energy.IEnergyContainerItem; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TileChargingTable extends TileLaserTableBase implements IHasWork { @Override diff --git a/common/buildcraft/silicon/TileIntegrationTable.java b/common/buildcraft/silicon/TileIntegrationTable.java index 334b8b90..23723210 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -19,12 +19,12 @@ import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.IFlexibleCrafter; import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.recipes.IIntegrationRecipe; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.InventoryMapper; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.InventoryMapper; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.utils.StringUtils; public class TileIntegrationTable extends TileLaserTableBase implements IFlexibleCrafter { diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 67d816ac..08b676e3 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -29,8 +29,8 @@ import buildcraft.api.tiles.IHasWork; import buildcraft.core.Box; import buildcraft.core.EntityLaser; import buildcraft.core.LaserData; -import buildcraft.core.RFBattery; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.block.TileBuildCraft; public class TileLaser extends TileBuildCraft implements IHasWork, IControllable { diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index 189e9058..61b947ec 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -17,9 +17,9 @@ import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.power.ILaserTarget; import buildcraft.api.tiles.IHasWork; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.utils.Average; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.utils.Average; public abstract class TileLaserTableBase extends TileBuildCraft implements ILaserTarget, IInventory, IHasWork { diff --git a/common/buildcraft/silicon/TileProgrammingTable.java b/common/buildcraft/silicon/TileProgrammingTable.java index fc85074b..6f47c6a3 100644 --- a/common/buildcraft/silicon/TileProgrammingTable.java +++ b/common/buildcraft/silicon/TileProgrammingTable.java @@ -21,12 +21,12 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.recipes.BuildcraftRecipeRegistry; import buildcraft.api.recipes.IProgrammingRecipe; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; +import buildcraft.core.lib.utils.StringUtils; +import buildcraft.core.lib.utils.Utils; public class TileProgrammingTable extends TileLaserTableBase implements IInventory, ISidedInventory, ICommandReceiver { public static final int WIDTH = 6; diff --git a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java index 93de3ff5..d400ddb9 100644 --- a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java @@ -13,10 +13,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; -import buildcraft.core.gui.slots.SlotPhantom; -import buildcraft.core.gui.slots.SlotUntouchable; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; +import buildcraft.core.lib.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.slots.SlotUntouchable; import buildcraft.silicon.TileAdvancedCraftingTable; public class ContainerAdvancedCraftingTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java index 1f12afc9..e63ebffb 100644 --- a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java +++ b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java @@ -13,7 +13,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.silicon.TileAssemblyTable; public class ContainerAssemblyTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/ContainerChargingTable.java b/common/buildcraft/silicon/gui/ContainerChargingTable.java index ed6d6f83..19c7b095 100644 --- a/common/buildcraft/silicon/gui/ContainerChargingTable.java +++ b/common/buildcraft/silicon/gui/ContainerChargingTable.java @@ -13,8 +13,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotValidated; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotValidated; import buildcraft.silicon.TileChargingTable; public class ContainerChargingTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java index a088c7f6..40fac240 100644 --- a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java +++ b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java @@ -13,10 +13,10 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotOutput; -import buildcraft.core.gui.slots.SlotUntouchable; -import buildcraft.core.gui.slots.SlotValidated; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotOutput; +import buildcraft.core.lib.gui.slots.SlotUntouchable; +import buildcraft.core.lib.gui.slots.SlotValidated; import buildcraft.silicon.TileIntegrationTable; public class ContainerIntegrationTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/ContainerProgrammingTable.java b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java index e82f03c2..a1919ed6 100644 --- a/common/buildcraft/silicon/gui/ContainerProgrammingTable.java +++ b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.BuildCraftContainer; import buildcraft.silicon.TileProgrammingTable; public class ContainerProgrammingTable extends BuildCraftContainer { diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index b54940f8..1e948671 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -23,9 +23,9 @@ import buildcraft.BuildCraftCore; import buildcraft.api.recipes.CraftingResult; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.silicon.TileAssemblyTable; public class GuiAssemblyTable extends GuiAdvancedInterface { diff --git a/common/buildcraft/silicon/gui/GuiLaserTable.java b/common/buildcraft/silicon/gui/GuiLaserTable.java index b762afc4..8ce26ec6 100644 --- a/common/buildcraft/silicon/gui/GuiLaserTable.java +++ b/common/buildcraft/silicon/gui/GuiLaserTable.java @@ -16,9 +16,9 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.silicon.TileLaserTableBase; public abstract class GuiLaserTable extends GuiBuildCraft { diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java index 22446402..a714d106 100644 --- a/common/buildcraft/silicon/gui/GuiProgrammingTable.java +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -18,9 +18,9 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.silicon.TileProgrammingTable; public class GuiProgrammingTable extends GuiAdvancedInterface { diff --git a/common/buildcraft/silicon/network/PacketHandlerSilicon.java b/common/buildcraft/silicon/network/PacketHandlerSilicon.java index dce5c9b9..f8972431 100644 --- a/common/buildcraft/silicon/network/PacketHandlerSilicon.java +++ b/common/buildcraft/silicon/network/PacketHandlerSilicon.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; -import buildcraft.core.network.PacketSlotChange; +import buildcraft.core.lib.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; import buildcraft.silicon.TileAdvancedCraftingTable; import buildcraft.silicon.TileAssemblyTable; diff --git a/common/buildcraft/transport/BlockFilteredBuffer.java b/common/buildcraft/transport/BlockFilteredBuffer.java index 618e3a3e..5434603d 100644 --- a/common/buildcraft/transport/BlockFilteredBuffer.java +++ b/common/buildcraft/transport/BlockFilteredBuffer.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftTransport; import buildcraft.api.events.BlockInteractionEvent; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 173f5736..f89a3d24 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -60,12 +60,12 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.BlockBuildCraft; +import buildcraft.core.lib.block.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.BCCreativeTab; -import buildcraft.core.TileBuffer; -import buildcraft.core.utils.MatrixTranformations; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.utils.MatrixTranformations; +import buildcraft.core.lib.utils.Utils; import buildcraft.transport.gates.GateDefinition; import buildcraft.transport.gates.GatePluggable; import buildcraft.transport.render.PipeRendererWorld; diff --git a/common/buildcraft/transport/FacadePluggable.java b/common/buildcraft/transport/FacadePluggable.java index 091c25e1..5c807d52 100644 --- a/common/buildcraft/transport/FacadePluggable.java +++ b/common/buildcraft/transport/FacadePluggable.java @@ -14,7 +14,7 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; public class FacadePluggable extends PipePluggable implements IFacadePluggable { public ItemFacade.FacadeState[] states; diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 52cdd476..792eb9dd 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -43,9 +43,9 @@ import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.BlockSpring; import buildcraft.core.BCCreativeTab; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePluggableItem { public static class FacadeState { diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index 342b31bf..d669657e 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -14,8 +14,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.utils.NBTUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.NBTUtils; import buildcraft.transport.BlockGenericPipe.Part; import buildcraft.transport.BlockGenericPipe.RaytraceResult; import buildcraft.transport.gates.GateDefinition.GateMaterial; diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index cc258b0f..02e70ffe 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -30,9 +30,9 @@ import buildcraft.api.core.BCLog; import buildcraft.api.core.IIconProvider; import buildcraft.core.BCCreativeTab; import buildcraft.core.IItemPipe; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.utils.ColorUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.ColorUtils; +import buildcraft.core.lib.utils.StringUtils; public class ItemPipe extends ItemBuildCraft implements IItemPipe { diff --git a/common/buildcraft/transport/ItemPipeWire.java b/common/buildcraft/transport/ItemPipeWire.java index 871874fe..e30c8328 100644 --- a/common/buildcraft/transport/ItemPipeWire.java +++ b/common/buildcraft/transport/ItemPipeWire.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.transport.PipeWire; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemPipeWire extends ItemBuildCraft { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index b4178be3..b798a79e 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -37,8 +37,8 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.core.IDropControlInventory; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.utils.Utils; import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.StatementSlot; import buildcraft.transport.statements.ActionValve.ValveState; diff --git a/common/buildcraft/transport/PipeColoringRecipe.java b/common/buildcraft/transport/PipeColoringRecipe.java index 20f89cbf..76c1452e 100644 --- a/common/buildcraft/transport/PipeColoringRecipe.java +++ b/common/buildcraft/transport/PipeColoringRecipe.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; public class PipeColoringRecipe implements IRecipe { diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index 63ffd8bd..a4ea98c5 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -18,7 +18,7 @@ import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftCore; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; @SideOnly(Side.CLIENT) public final class PipeToolTipManager { diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index 9211c2e0..0711e594 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -20,7 +20,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.utils.BitSetUtils; +import buildcraft.core.lib.utils.BitSetUtils; public abstract class PipeTransport { diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index b090bc55..17f34f7f 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -29,7 +29,7 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.MathUtils; +import buildcraft.core.lib.utils.MathUtils; import buildcraft.transport.network.PacketFluidUpdate; import buildcraft.transport.pipes.PipeFluidsCobblestone; import buildcraft.transport.pipes.PipeFluidsDiamond; diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index fb166deb..20e8b5ab 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -32,9 +32,9 @@ import buildcraft.api.core.BCLog; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.utils.BlockUtils; -import buildcraft.core.utils.MathUtils; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.utils.BlockUtils; +import buildcraft.core.lib.utils.MathUtils; import buildcraft.transport.network.PacketPipeTransportItemStackRequest; import buildcraft.transport.network.PacketPipeTransportTraveler; import buildcraft.transport.pipes.events.PipeEventItem; diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 6f809568..218e4f5c 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -28,7 +28,7 @@ import buildcraft.api.power.IEngine; import buildcraft.api.power.IRedstoneEngine; import buildcraft.api.transport.IPipeTile; import buildcraft.core.DefaultProps; -import buildcraft.core.TileBuildCraft; +import buildcraft.core.lib.block.TileBuildCraft; import buildcraft.transport.network.PacketPowerUpdate; import buildcraft.transport.pipes.PipePowerCobblestone; import buildcraft.transport.pipes.PipePowerDiamond; diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index 8a783c2d..4606a784 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -13,8 +13,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import buildcraft.core.TileBuildCraft; -import buildcraft.core.inventory.SimpleInventory; +import buildcraft.core.lib.block.TileBuildCraft; +import buildcraft.core.lib.inventory.SimpleInventory; public class TileFilteredBuffer extends TileBuildCraft implements IInventory { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 564d581d..c16dd370 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -52,13 +52,13 @@ import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.DefaultProps; import buildcraft.core.IDropControlInventory; -import buildcraft.core.ITileBufferHolder; -import buildcraft.core.TileBuffer; -import buildcraft.core.network.Packet; -import buildcraft.core.network.IGuiReturnHandler; -import buildcraft.core.network.ISyncedTile; -import buildcraft.core.network.PacketTileState; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.ITileBufferHolder; +import buildcraft.core.lib.TileBuffer; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.IGuiReturnHandler; +import buildcraft.core.lib.network.ISyncedTile; +import buildcraft.core.lib.network.PacketTileState; +import buildcraft.core.lib.utils.Utils; import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.GatePluggable; diff --git a/common/buildcraft/transport/TravelingItem.java b/common/buildcraft/transport/TravelingItem.java index ddd9f8a7..cc9f7372 100644 --- a/common/buildcraft/transport/TravelingItem.java +++ b/common/buildcraft/transport/TravelingItem.java @@ -28,7 +28,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.EnumColor; import buildcraft.api.core.Position; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; public class TravelingItem { diff --git a/common/buildcraft/transport/gates/GateDefinition.java b/common/buildcraft/transport/gates/GateDefinition.java index 2905540e..d896f49b 100644 --- a/common/buildcraft/transport/gates/GateDefinition.java +++ b/common/buildcraft/transport/gates/GateDefinition.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public final class GateDefinition { diff --git a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java index 0e001b90..e2e8e8a8 100644 --- a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java +++ b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import buildcraft.api.gates.IGateExpansion; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public abstract class GateExpansionBuildcraft implements IGateExpansion { diff --git a/common/buildcraft/transport/gates/GatePluggable.java b/common/buildcraft/transport/gates/GatePluggable.java index 5e24997e..c29465fa 100644 --- a/common/buildcraft/transport/gates/GatePluggable.java +++ b/common/buildcraft/transport/gates/GatePluggable.java @@ -19,7 +19,7 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.Gate; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/gates/ItemGate.java b/common/buildcraft/transport/gates/ItemGate.java index 3b5b70a0..9f0bcac0 100755 --- a/common/buildcraft/transport/gates/ItemGate.java +++ b/common/buildcraft/transport/gates/ItemGate.java @@ -37,9 +37,9 @@ import buildcraft.api.statements.StatementManager; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; import buildcraft.transport.gates.GateDefinition.GateLogic; diff --git a/common/buildcraft/transport/gui/ContainerDiamondPipe.java b/common/buildcraft/transport/gui/ContainerDiamondPipe.java index a8f537fc..b8ccf783 100644 --- a/common/buildcraft/transport/gui/ContainerDiamondPipe.java +++ b/common/buildcraft/transport/gui/ContainerDiamondPipe.java @@ -12,8 +12,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.IDiamondPipe; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java index ee94935a..9adc7360 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java @@ -12,8 +12,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.pipes.PipeFluidsEmerald; public class ContainerEmeraldFluidPipe extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java index 92eb68b8..b6795350 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java @@ -12,8 +12,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotPhantom; import buildcraft.transport.pipes.PipeItemsEmerald; public class ContainerEmeraldPipe extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java index 4e5f84b1..b171f3de 100644 --- a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java @@ -24,15 +24,15 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.slots.SlotPhantom; -import buildcraft.core.gui.tooltips.ToolTip; -import buildcraft.core.gui.tooltips.ToolTipLine; -import buildcraft.core.gui.widgets.ButtonWidget; -import buildcraft.core.network.PacketGuiReturn; -import buildcraft.core.utils.RevolvingList; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.tooltips.ToolTip; +import buildcraft.core.lib.gui.tooltips.ToolTipLine; +import buildcraft.core.lib.gui.widgets.ButtonWidget; +import buildcraft.core.lib.network.PacketGuiReturn; +import buildcraft.core.lib.utils.RevolvingList; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeItemsEmzuli; public class ContainerEmzuliPipe extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java index c7f47909..3a9a00d8 100644 --- a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java +++ b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java @@ -13,9 +13,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.gui.slots.SlotPhantom; -import buildcraft.core.gui.slots.SlotValidated; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.gui.slots.SlotPhantom; +import buildcraft.core.lib.gui.slots.SlotValidated; import buildcraft.transport.TileFilteredBuffer; public class ContainerFilteredBuffer extends BuildCraftContainer { diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index 032f4e65..2f66b768 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -29,12 +29,12 @@ import buildcraft.BuildCraftCore; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementManager; -import buildcraft.core.gui.BuildCraftContainer; -import buildcraft.core.network.Packet; -import buildcraft.core.network.CommandWriter; -import buildcraft.core.network.ICommandReceiver; -import buildcraft.core.network.PacketCommand; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.gui.BuildCraftContainer; +import buildcraft.core.lib.network.Packet; +import buildcraft.core.lib.network.command.CommandWriter; +import buildcraft.core.lib.network.command.ICommandReceiver; +import buildcraft.core.lib.network.command.PacketCommand; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.ActionActiveState; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index b092ced3..19707e76 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.IDiamondPipe; public class GuiDiamondPipe extends GuiBuildCraft { diff --git a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java index 2c38dc38..976545eb 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java @@ -14,8 +14,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeFluidsEmerald; public class GuiEmeraldFluidPipe extends GuiBuildCraft { diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index 9230232f..59e90152 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -14,12 +14,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.gui.buttons.GuiImageButton; -import buildcraft.core.gui.buttons.IButtonClickEventListener; -import buildcraft.core.gui.buttons.IButtonClickEventTrigger; -import buildcraft.core.network.PacketGuiReturn; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.gui.buttons.GuiImageButton; +import buildcraft.core.lib.gui.buttons.IButtonClickEventListener; +import buildcraft.core.lib.gui.buttons.IButtonClickEventTrigger; +import buildcraft.core.lib.network.PacketGuiReturn; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeItemsEmerald; import buildcraft.transport.pipes.PipeItemsEmerald.FilterMode; diff --git a/common/buildcraft/transport/gui/GuiEmzuliPipe.java b/common/buildcraft/transport/gui/GuiEmzuliPipe.java index 05403bd5..2b955d6d 100644 --- a/common/buildcraft/transport/gui/GuiEmzuliPipe.java +++ b/common/buildcraft/transport/gui/GuiEmzuliPipe.java @@ -12,8 +12,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.gui.GuiBuildCraft; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.GuiBuildCraft; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.pipes.PipeItemsEmzuli; public class GuiEmzuliPipe extends GuiBuildCraft { diff --git a/common/buildcraft/transport/gui/GuiFilteredBuffer.java b/common/buildcraft/transport/gui/GuiFilteredBuffer.java index 819c1834..8a91e2f8 100644 --- a/common/buildcraft/transport/gui/GuiFilteredBuffer.java +++ b/common/buildcraft/transport/gui/GuiFilteredBuffer.java @@ -16,7 +16,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import buildcraft.core.DefaultProps; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.TileFilteredBuffer; public class GuiFilteredBuffer extends GuiContainer { diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index 5a21ce91..29f9db9b 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -19,11 +19,11 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; -import buildcraft.core.gui.AdvancedSlot; -import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.StatementParameterSlot; -import buildcraft.core.gui.StatementSlot; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.gui.AdvancedSlot; +import buildcraft.core.lib.gui.GuiAdvancedInterface; +import buildcraft.core.lib.gui.StatementParameterSlot; +import buildcraft.core.lib.gui.StatementSlot; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.ActionActiveState; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java index 44bd81f7..8a814988 100644 --- a/common/buildcraft/transport/network/PacketFluidUpdate.java +++ b/common/buildcraft/transport/network/PacketFluidUpdate.java @@ -18,10 +18,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import buildcraft.core.network.PacketCoordinates; +import buildcraft.core.lib.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BitSetUtils; +import buildcraft.core.lib.utils.BitSetUtils; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java index a3f63ff9..2e12972d 100644 --- a/common/buildcraft/transport/network/PacketHandlerTransport.java +++ b/common/buildcraft/transport/network/PacketHandlerTransport.java @@ -19,9 +19,9 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; -import buildcraft.core.network.PacketSlotChange; +import buildcraft.core.lib.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java index 93528b49..4027aef1 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java @@ -12,9 +12,9 @@ import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; -import buildcraft.core.utils.NetworkUtils; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.TravelingItem; public class PacketPipeTransportItemStack extends Packet { diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java index e718c892..c1c9a104 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java @@ -13,7 +13,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import buildcraft.BuildCraftTransport; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java index ee7d9290..6c338f61 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java +++ b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java @@ -15,7 +15,7 @@ import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.core.EnumColor; -import buildcraft.core.network.Packet; +import buildcraft.core.lib.network.Packet; import buildcraft.core.network.PacketIds; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/transport/network/PacketPowerUpdate.java b/common/buildcraft/transport/network/PacketPowerUpdate.java index 1bf21a43..85eb22b1 100644 --- a/common/buildcraft/transport/network/PacketPowerUpdate.java +++ b/common/buildcraft/transport/network/PacketPowerUpdate.java @@ -10,7 +10,7 @@ package buildcraft.transport.network; import io.netty.buffer.ByteBuf; -import buildcraft.core.network.PacketCoordinates; +import buildcraft.core.lib.network.PacketCoordinates; import buildcraft.core.network.PacketIds; import buildcraft.transport.render.PipeRendererTESR; diff --git a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java index 50661b9d..e9113482 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java @@ -29,10 +29,9 @@ import net.minecraftforge.fluids.Fluid; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.utils.FluidUtils; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.utils.FluidUtils; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.IDiamondPipe; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java index e06e587a..65803382 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java @@ -24,10 +24,9 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.utils.FluidUtils; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.utils.FluidUtils; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index 20e62270..8e327e95 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -28,7 +28,7 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.ISerializable; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.RFBattery; +import buildcraft.core.lib.RFBattery; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportFluids; diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java index 6141bc1f..01de1eb1 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java @@ -32,7 +32,7 @@ import buildcraft.api.core.ISerializable; import buildcraft.api.statements.IActionInternal; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 4d14cb31..d6b26f69 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -27,10 +27,9 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.IDiamondPipe; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index dbf1a515..29b50397 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -23,13 +23,12 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.ISerializable; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryWrapper; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.inventory.StackHelper; -import buildcraft.core.network.IGuiReturnHandler; -import buildcraft.core.utils.NetworkUtils; -import buildcraft.core.utils.Utils; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryWrapper; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.StackHelper; +import buildcraft.core.lib.network.IGuiReturnHandler; +import buildcraft.core.lib.utils.NetworkUtils; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java index 777f869e..4f4efdb7 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java @@ -27,9 +27,9 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.core.EnumColor; import buildcraft.api.statements.IActionInternal; import buildcraft.core.GuiIds; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.SimpleInventory; -import buildcraft.core.network.IGuiReturnHandler; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.SimpleInventory; +import buildcraft.core.lib.network.IGuiReturnHandler; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index bb58107e..550fb1bb 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.core.utils.MathUtils; +import buildcraft.core.lib.utils.MathUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java index 6519048b..c291fa3f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsLapis.java +++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java @@ -25,7 +25,7 @@ import buildcraft.api.core.EnumColor; import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 368321de..f849476e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -30,10 +30,10 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; -import buildcraft.core.RFBattery; -import buildcraft.core.inventory.ITransactor; -import buildcraft.core.inventory.Transactor; -import buildcraft.core.inventory.filters.StackFilter; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.inventory.ITransactor; +import buildcraft.core.lib.inventory.Transactor; +import buildcraft.core.lib.inventory.filters.StackFilter; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 75094328..1c20733e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -28,9 +28,9 @@ import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesHandler.StripesHandlerType; import buildcraft.api.transport.IStripesPipe; import buildcraft.api.transport.PipeManager; -import buildcraft.core.inventory.InvUtils; +import buildcraft.core.lib.inventory.InvUtils; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.utils.BlockUtils; +import buildcraft.core.lib.utils.BlockUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 1beab622..bde52223 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -26,9 +26,9 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.RFBattery; -import buildcraft.core.inventory.InvUtils; -import buildcraft.core.inventory.InventoryWrapper; +import buildcraft.core.lib.RFBattery; +import buildcraft.core.lib.inventory.InvUtils; +import buildcraft.core.lib.inventory.InventoryWrapper; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index 00c156c8..a91042e2 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -16,7 +16,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.TileBuffer; +import buildcraft.core.lib.TileBuffer; import buildcraft.transport.Pipe; public abstract class PipeLogicIron { diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 7c46ee6f..c02c04ea 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import buildcraft.core.TileBuffer; +import buildcraft.core.lib.TileBuffer; import buildcraft.transport.Pipe; public abstract class PipeLogicWood { diff --git a/common/buildcraft/transport/pipes/PipePowerEmerald.java b/common/buildcraft/transport/pipes/PipePowerEmerald.java index 540439a4..f6a2373c 100644 --- a/common/buildcraft/transport/pipes/PipePowerEmerald.java +++ b/common/buildcraft/transport/pipes/PipePowerEmerald.java @@ -9,7 +9,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; -import buildcraft.core.RFBattery; +import buildcraft.core.lib.RFBattery; import buildcraft.transport.PipeIconProvider; public class PipePowerEmerald extends PipePowerWood { diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index 294854e4..807190a8 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -27,7 +27,7 @@ import buildcraft.api.core.IIconProvider; import buildcraft.api.statements.IActionInternal; import buildcraft.api.tools.IToolWrench; import buildcraft.core.PowerMode; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 4b2f678a..cbce5997 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -24,7 +24,7 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.power.IRedstoneEngineReceiver; import buildcraft.api.transport.IPipeTile; -import buildcraft.core.RFBattery; +import buildcraft.core.lib.RFBattery; import buildcraft.transport.IPipeTransportPowerHook; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java index 2e679e32..7c834cc5 100755 --- a/common/buildcraft/transport/pluggable/ItemLens.java +++ b/common/buildcraft/transport/pluggable/ItemLens.java @@ -27,9 +27,9 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.ItemBuildCraft; -import buildcraft.core.utils.ColorUtils; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.items.ItemBuildCraft; +import buildcraft.core.lib.utils.ColorUtils; +import buildcraft.core.lib.utils.StringUtils; public class ItemLens extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/transport/pluggable/ItemPlug.java b/common/buildcraft/transport/pluggable/ItemPlug.java index 3928cf53..352d1387 100755 --- a/common/buildcraft/transport/pluggable/ItemPlug.java +++ b/common/buildcraft/transport/pluggable/ItemPlug.java @@ -21,7 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemPlug extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java index acc8b640..edbc4e96 100755 --- a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java +++ b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java @@ -24,7 +24,7 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.ItemBuildCraft; +import buildcraft.core.lib.items.ItemBuildCraft; public class ItemPowerAdapter extends ItemBuildCraft implements IPipePluggableItem { diff --git a/common/buildcraft/transport/pluggable/LensPluggable.java b/common/buildcraft/transport/pluggable/LensPluggable.java index 9ca2eed6..aefcfebb 100644 --- a/common/buildcraft/transport/pluggable/LensPluggable.java +++ b/common/buildcraft/transport/pluggable/LensPluggable.java @@ -16,8 +16,8 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.utils.ColorUtils; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.ColorUtils; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TravelingItem; import buildcraft.transport.pipes.events.PipeEventItem; diff --git a/common/buildcraft/transport/pluggable/PlugPluggable.java b/common/buildcraft/transport/pluggable/PlugPluggable.java index 0f8c45ad..ad36c38c 100644 --- a/common/buildcraft/transport/pluggable/PlugPluggable.java +++ b/common/buildcraft/transport/pluggable/PlugPluggable.java @@ -15,7 +15,7 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; public class PlugPluggable extends PipePluggable { diff --git a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java index bd66d84a..fc03a554 100644 --- a/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java +++ b/common/buildcraft/transport/pluggable/PowerAdapterPluggable.java @@ -17,7 +17,7 @@ import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; public class PowerAdapterPluggable extends PipePluggable implements IEnergyHandler { diff --git a/common/buildcraft/transport/recipes/GateExpansionRecipe.java b/common/buildcraft/transport/recipes/GateExpansionRecipe.java index 9694f1e7..3c879407 100644 --- a/common/buildcraft/transport/recipes/GateExpansionRecipe.java +++ b/common/buildcraft/transport/recipes/GateExpansionRecipe.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.IGateExpansion; import buildcraft.api.recipes.CraftingResult; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.gates.ItemGate; diff --git a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java index 759a3126..556a0109 100644 --- a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java +++ b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import buildcraft.BuildCraftTransport; import buildcraft.api.recipes.CraftingResult; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; import buildcraft.silicon.ItemRedstoneChipset; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.gates.GateDefinition.GateLogic; diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index f86853a9..92bc8bf4 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -23,7 +23,7 @@ import buildcraft.BuildCraftTransport; import buildcraft.api.facades.FacadeType; import buildcraft.api.facades.IFacadeItem; import buildcraft.core.CoreConstants; -import buildcraft.core.render.RenderUtils; +import buildcraft.core.lib.render.RenderUtils; import buildcraft.transport.ItemFacade; import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index e98ebd2e..7fa4ad9c 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -20,7 +20,7 @@ import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index 76744f16..81ca2ff3 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -22,7 +22,7 @@ import net.minecraftforge.client.IItemRenderer; import buildcraft.BuildCraftTransport; import buildcraft.core.CoreConstants; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.transport.PipeIconProvider; public class PipeItemRenderer implements IItemRenderer { diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index 06ec67b3..aee3db70 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -43,10 +43,10 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeWire; import buildcraft.core.CoreConstants; import buildcraft.core.DefaultProps; -import buildcraft.core.render.RenderEntityBlock; -import buildcraft.core.render.RenderEntityBlock.RenderInfo; -import buildcraft.core.render.RenderUtils; -import buildcraft.core.utils.MatrixTranformations; +import buildcraft.core.lib.render.RenderEntityBlock; +import buildcraft.core.lib.render.RenderEntityBlock.RenderInfo; +import buildcraft.core.lib.render.RenderUtils; +import buildcraft.core.lib.utils.MatrixTranformations; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index a25d5159..79182a9e 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -25,7 +25,7 @@ import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; -import buildcraft.core.utils.ColorUtils; +import buildcraft.core.lib.utils.ColorUtils; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/transport/schematics/BptItemPipeFilters.java b/common/buildcraft/transport/schematics/BptItemPipeFilters.java index f79fad0e..491c388e 100644 --- a/common/buildcraft/transport/schematics/BptItemPipeFilters.java +++ b/common/buildcraft/transport/schematics/BptItemPipeFilters.java @@ -14,7 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.SchematicTile; -import buildcraft.core.inventory.SimpleInventory; +import buildcraft.core.lib.inventory.SimpleInventory; public class BptItemPipeFilters extends BptPipeExtension { diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index 05372a63..b3691869 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionEnergyPulsar extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index fb6d6fcc..6c95a9c0 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionExtractionPreset extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 62b93916..690c2dab 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; import buildcraft.api.transport.PipeWire; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; public class ActionParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java index dd0c6728..41fd86b4 100644 --- a/common/buildcraft/transport/statements/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionPipeColor extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index 61a96fad..b1d09a2b 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IActionInternal; import buildcraft.core.statements.ActionRedstoneOutput; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionRedstoneFaderOutput extends ActionRedstoneOutput implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index 7dfbf6b5..d8dcd6b6 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -17,7 +17,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; public class ActionSignalOutput extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index d5d9762d..86321917 100644 --- a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -14,7 +14,7 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class ActionSingleEnergyPulse extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index 12d48cfd..d5a5e223 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.transport.IPipe; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterDirection; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransport; diff --git a/common/buildcraft/transport/statements/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java index 8aaafbe5..7a3c507b 100644 --- a/common/buildcraft/transport/statements/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -16,7 +16,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; public class TriggerClockTimer extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index ed202e6c..22b3c154 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -20,7 +20,7 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; import buildcraft.api.transport.PipeWire; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Gate; public class TriggerParameterSignal implements IStatementParameter { diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 389982ff..9332af7f 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -25,9 +25,9 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.inventory.StackHelper; +import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportFluids; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 92eb7a06..831df9ab 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -18,7 +18,7 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.PipeWire; import buildcraft.core.statements.BCStatement; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.Pipe; public class TriggerPipeSignal extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index dd042578..5731c2ae 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -19,7 +19,7 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.statements.BCStatement; import buildcraft.core.statements.StatementParameterRedstoneGateSideOnly; -import buildcraft.core.utils.StringUtils; +import buildcraft.core.lib.utils.StringUtils; import buildcraft.transport.TileGenericPipe; public class TriggerRedstoneFaderInput extends BCStatement implements ITriggerInternal {