Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/7.1.x' into alexiil-7.x-mc1.8-equal
Browse files Browse the repository at this point in the history
This closes AlexIIL/BuildCraft_1.8_Issues#46
Conflicts:
	api/buildcraft/api/blueprints/Schematic.java
	api/buildcraft/api/blueprints/SchematicBlock.java
	api/buildcraft/api/blueprints/SchematicMask.java
	api/buildcraft/api/blueprints/SchematicTile.java
	api/buildcraft/api/blueprints/package-info.java
	api/buildcraft/api/core/BCLog.java
	api/buildcraft/api/core/BlockIndex.java
	api/buildcraft/api/core/IPathProvider.java
	api/buildcraft/api/core/Position.java
	api/buildcraft/api/core/package-info.java
	api/buildcraft/api/crops/CropManager.java
	api/buildcraft/api/events/BlockPlacedDownEvent.java
	api/buildcraft/api/events/PipePlacedEvent.java
	api/buildcraft/api/events/RobotPlacementEvent.java
	api/buildcraft/api/events/package-info.java
	api/buildcraft/api/lists/package-info.java
	api/buildcraft/api/robots/AIRobot.java
	api/buildcraft/api/robots/DockingStation.java
	api/buildcraft/api/robots/IRequestProvider.java
	api/buildcraft/api/robots/ResourceId.java
	api/buildcraft/api/robots/ResourceIdBlock.java
	api/buildcraft/api/robots/ResourceIdRequest.java
	api/buildcraft/api/robots/package-info.java
	api/buildcraft/api/transport/IStripesPipe.java
	api/cofh/api/CoFHAPIProps.java
	build.gradle
	buildcraft_resources/assets/buildcraft/lang/en_US.lang
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architect/led_green.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/architectBlock/bottom.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/front.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top_on.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/constructionMarkerBlock/default.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/front.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_green.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/led_red.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlock/side.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/box.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/clear.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/cylinder.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/fill.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/flatten.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/frame.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/horizon.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/pyramid.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/fillerBlockIcons/stairs.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/libraryBlock/top.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/machineBlock/drill.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/machineBlock/front.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/machineBlock/side.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/marker/path.png
	buildcraft_resources/assets/buildcraftbuilders/textures/blocks/marker/volume.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_blue.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_green.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_overheat.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_red.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engine/trunk_yellow.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/base.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/chamber.png
	buildcraft_resources/assets/buildcraftcore/textures/blocks/engineWood/icon.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/black.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/blue.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/brown.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/clean.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/cyan.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/gray.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/green.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/light_blue.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/light_gray.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/lime.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/magenta.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/orange.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/pink.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/purple.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/red.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/white.png
	buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/yellow.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbench/side_alt.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/autoWorkbenchBlock/side_alt.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/bottom.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/hopperBlock/top.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/mining_well/top.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/pump/top_alt.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/pump/top_alt2.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/side.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/top_alt.png
	buildcraft_resources/assets/buildcraftfactory/textures/blocks/pumpBlock/top_alt2.png
	buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zonePlan/front_on.png
	buildcraft_resources/assets/buildcraftrobotics/textures/blocks/zone_plan/front_on.png
	buildcraft_resources/assets/buildcraftrobotics/textures/items/board/blue.png
	buildcraft_resources/assets/buildcraftrobotics/textures/items/board/clean.png
	buildcraft_resources/assets/buildcraftrobotics/textures/items/board/green.png
	buildcraft_resources/assets/buildcraftrobotics/textures/items/board/red.png
	buildcraft_resources/assets/buildcraftrobotics/textures/items/board/yellow.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_dark.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_and_lit.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_material_quartz.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_or.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllDaizuli_solid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmerald_solid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllEmzuli_solid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllIron_solid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeAllWood_solid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsCobblestone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_center.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_down.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_east.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_item.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_north.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_south.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_up.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsDiamond_west_cb.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsEmerald_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsGold.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsIron_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsQuartz.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsSandstone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsStone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsVoid.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeFluidsWood_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsClay.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsCobblestone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_center.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_down.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_east.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_item.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_north.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_south.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_up.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsDiamond_west_cb.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmerald_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsEmzuli_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsGold.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsSandstone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsStone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipeItemsWood_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerDiamond.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerEmerald_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerGold.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerStone.png
	buildcraft_resources/assets/buildcrafttransport/textures/blocks/pipes/pipePowerWood_standard.png
	buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_active.png
	buildcraft_resources/assets/buildcrafttransport/textures/items/triggers/trigger_pipesignal_red_inactive.png
	buildcraft_resources/changelog/7.0.6
	common/buildcraft/BuildCraftBuilders.java
	common/buildcraft/BuildCraftCore.java
	common/buildcraft/BuildCraftEnergy.java
	common/buildcraft/BuildCraftFactory.java
	common/buildcraft/BuildCraftMod.java
	common/buildcraft/BuildCraftRobotics.java
	common/buildcraft/BuildCraftSilicon.java
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/builders/BlockArchitect.java
	common/buildcraft/builders/BlockBlueprintLibrary.java
	common/buildcraft/builders/BlockBuilder.java
	common/buildcraft/builders/BlockConstructionMarker.java
	common/buildcraft/builders/BlockFiller.java
	common/buildcraft/builders/BlockFrame.java
	common/buildcraft/builders/BlockQuarry.java
	common/buildcraft/builders/BuilderProxy.java
	common/buildcraft/builders/BuilderProxyClient.java
	common/buildcraft/builders/BuildersGuiHandler.java
	common/buildcraft/builders/EntityMechanicalArm.java
	common/buildcraft/builders/EventHandlerBuilders.java
	common/buildcraft/builders/HeuristicBlockDetection.java
	common/buildcraft/builders/ItemBlueprint.java
	common/buildcraft/builders/ItemBlueprintStandard.java
	common/buildcraft/builders/ItemBlueprintTemplate.java
	common/buildcraft/builders/ItemConstructionMarker.java
	common/buildcraft/builders/LibraryDatabase.java
	common/buildcraft/builders/TileArchitect.java
	common/buildcraft/builders/TileBlueprintLibrary.java
	common/buildcraft/builders/TileBuilder.java
	common/buildcraft/builders/TileConstructionMarker.java
	common/buildcraft/builders/TileFiller.java
	common/buildcraft/builders/TileQuarry.java
	common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java
	common/buildcraft/builders/blueprints/RealBlueprintDeployer.java
	common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java
	common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java
	common/buildcraft/builders/gui/ContainerArchitect.java
	common/buildcraft/builders/gui/ContainerBlueprintLibrary.java
	common/buildcraft/builders/gui/ContainerBuilder.java
	common/buildcraft/builders/gui/ContainerFiller.java
	common/buildcraft/builders/gui/GuiArchitect.java
	common/buildcraft/builders/gui/GuiBlueprintLibrary.java
	common/buildcraft/builders/gui/GuiBuilder.java
	common/buildcraft/builders/gui/GuiFiller.java
	common/buildcraft/builders/gui/SlotArchitect.java
	common/buildcraft/builders/gui/SlotBlueprintLibrary.java
	common/buildcraft/builders/render/RenderArchitect.java
	common/buildcraft/builders/render/RenderConstructionMarker.java
	common/buildcraft/builders/schematics/SchematicBed.java
	common/buildcraft/builders/schematics/SchematicCactus.java
	common/buildcraft/builders/schematics/SchematicCustomStack.java
	common/buildcraft/builders/schematics/SchematicDirt.java
	common/buildcraft/builders/schematics/SchematicDoor.java
	common/buildcraft/builders/schematics/SchematicEnderChest.java
	common/buildcraft/builders/schematics/SchematicFactoryBlock.java
	common/buildcraft/builders/schematics/SchematicFactoryEntity.java
	common/buildcraft/builders/schematics/SchematicFactoryMask.java
	common/buildcraft/builders/schematics/SchematicFarmland.java
	common/buildcraft/builders/schematics/SchematicFire.java
	common/buildcraft/builders/schematics/SchematicGlassPane.java
	common/buildcraft/builders/schematics/SchematicGravel.java
	common/buildcraft/builders/schematics/SchematicHanging.java
	common/buildcraft/builders/schematics/SchematicLever.java
	common/buildcraft/builders/schematics/SchematicMinecart.java
	common/buildcraft/builders/schematics/SchematicPiston.java
	common/buildcraft/builders/schematics/SchematicPortal.java
	common/buildcraft/builders/schematics/SchematicPumpkin.java
	common/buildcraft/builders/schematics/SchematicRail.java
	common/buildcraft/builders/schematics/SchematicRedstoneDiode.java
	common/buildcraft/builders/schematics/SchematicRedstoneLamp.java
	common/buildcraft/builders/schematics/SchematicRedstoneWire.java
	common/buildcraft/builders/schematics/SchematicSeeds.java
	common/buildcraft/builders/schematics/SchematicSign.java
	common/buildcraft/builders/schematics/SchematicSkull.java
	common/buildcraft/builders/schematics/SchematicStairs.java
	common/buildcraft/builders/schematics/SchematicStone.java
	common/buildcraft/builders/schematics/SchematicTripWireHook.java
	common/buildcraft/builders/statements/ActionFiller.java
	common/buildcraft/builders/statements/BuildersActionProvider.java
	common/buildcraft/builders/urbanism/AnchoredBox.java
	common/buildcraft/builders/urbanism/BlockUrbanist.java
	common/buildcraft/builders/urbanism/ContainerUrbanist.java
	common/buildcraft/builders/urbanism/EntityUrbanist.java
	common/buildcraft/builders/urbanism/GuiUrbanist.java
	common/buildcraft/builders/urbanism/TileUrbanist.java
	common/buildcraft/builders/urbanism/UrbanistTool.java
	common/buildcraft/builders/urbanism/UrbanistToolArea.java
	common/buildcraft/builders/urbanism/UrbanistToolBlock.java
	common/buildcraft/builders/urbanism/UrbanistToolBlueprint.java
	common/buildcraft/builders/urbanism/UrbanistToolErase.java
	common/buildcraft/builders/urbanism/UrbanistToolFiller.java
	common/buildcraft/builders/urbanism/UrbanistToolPath.java
	common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java
	common/buildcraft/core/AchievementManager.java
	common/buildcraft/core/BCCreativeTab.java
	common/buildcraft/core/BlockBuildTool.java
	common/buildcraft/core/BlockEngine.java
	common/buildcraft/core/BlockHatched.java
	common/buildcraft/core/BlockMarker.java
	common/buildcraft/core/BlockPathMarker.java
	common/buildcraft/core/BlockSpring.java
	common/buildcraft/core/Box.java
	common/buildcraft/core/ChunkIndex.java
	common/buildcraft/core/CompatHooks.java
	common/buildcraft/core/CoreConstants.java
	common/buildcraft/core/CoreGuiHandler.java
	common/buildcraft/core/CoreIconProvider.java
	common/buildcraft/core/DefaultAreaProvider.java
	common/buildcraft/core/DefaultProps.java
	common/buildcraft/core/EntityLaser.java
	common/buildcraft/core/GuiIds.java
	common/buildcraft/core/InterModComms.java
	common/buildcraft/core/ItemDebugger.java
	common/buildcraft/core/ItemGear.java
	common/buildcraft/core/ItemList.java
	common/buildcraft/core/ItemMapLocation.java
	common/buildcraft/core/ItemPaintbrush.java
	common/buildcraft/core/ItemSpring.java
	common/buildcraft/core/ItemWrench.java
	common/buildcraft/core/LaserData.java
	common/buildcraft/core/LaserKind.java
	common/buildcraft/core/RenderPathMarker.java
	common/buildcraft/core/SchematicEngine.java
	common/buildcraft/core/SpringPopulate.java
	common/buildcraft/core/StackAtPosition.java
	common/buildcraft/core/TickHandlerCore.java
	common/buildcraft/core/TileEngineWood.java
	common/buildcraft/core/TileMarker.java
	common/buildcraft/core/TilePathMarker.java
	common/buildcraft/core/Version.java
	common/buildcraft/core/blueprints/Blueprint.java
	common/buildcraft/core/blueprints/BlueprintBase.java
	common/buildcraft/core/blueprints/BlueprintReadConfiguration.java
	common/buildcraft/core/blueprints/BptBuilderBase.java
	common/buildcraft/core/blueprints/BptBuilderBlueprint.java
	common/buildcraft/core/blueprints/BptBuilderTemplate.java
	common/buildcraft/core/blueprints/BptContext.java
	common/buildcraft/core/blueprints/BptDataStream.java
	common/buildcraft/core/blueprints/BptError.java
	common/buildcraft/core/blueprints/LibraryId.java
	common/buildcraft/core/blueprints/SchematicRegistry.java
	common/buildcraft/core/blueprints/Template.java
	common/buildcraft/core/builders/BuildingItem.java
	common/buildcraft/core/builders/BuildingSlot.java
	common/buildcraft/core/builders/BuildingSlotBlock.java
	common/buildcraft/core/builders/BuildingSlotEntity.java
	common/buildcraft/core/builders/BuildingSlotIterator.java
	common/buildcraft/core/builders/BuildingSlotMapIterator.java
	common/buildcraft/core/builders/IBuildingItem.java
	common/buildcraft/core/builders/IBuildingItemsProvider.java
	common/buildcraft/core/builders/TileAbstractBuilder.java
	common/buildcraft/core/builders/patterns/FillerPattern.java
	common/buildcraft/core/builders/patterns/FillerRegistry.java
	common/buildcraft/core/builders/patterns/PatternBox.java
	common/buildcraft/core/builders/patterns/PatternClear.java
	common/buildcraft/core/builders/patterns/PatternCylinder.java
	common/buildcraft/core/builders/patterns/PatternFill.java
	common/buildcraft/core/builders/patterns/PatternFlatten.java
	common/buildcraft/core/builders/patterns/PatternFrame.java
	common/buildcraft/core/builders/patterns/PatternHorizon.java
	common/buildcraft/core/builders/patterns/PatternParameterYDir.java
	common/buildcraft/core/builders/patterns/PatternPyramid.java
	common/buildcraft/core/builders/patterns/PatternStairs.java
	common/buildcraft/core/builders/schematics/SchematicBlockCreative.java
	common/buildcraft/core/builders/schematics/SchematicFree.java
	common/buildcraft/core/builders/schematics/SchematicIgnore.java
	common/buildcraft/core/builders/schematics/SchematicIgnoreMeta.java
	common/buildcraft/core/builders/schematics/SchematicRotateMeta.java
	common/buildcraft/core/builders/schematics/SchematicStandalone.java
	common/buildcraft/core/builders/schematics/SchematicTileCreative.java
	common/buildcraft/core/builders/schematics/SchematicWallSide.java
	common/buildcraft/core/command/SubCommandChangelog.java
	common/buildcraft/core/command/SubCommandVersion.java
	common/buildcraft/core/config/BuildCraftConfiguration.java
	common/buildcraft/core/config/ConfigManager.java
	common/buildcraft/core/crops/CropHandlerPlantable.java
	common/buildcraft/core/crops/CropHandlerReeds.java
	common/buildcraft/core/internal/IBoxProvider.java
	common/buildcraft/core/internal/IBoxesProvider.java
	common/buildcraft/core/internal/IDropControlInventory.java
	common/buildcraft/core/internal/IFramePipeConnection.java
	common/buildcraft/core/lib/AchievementManager.java
	common/buildcraft/core/lib/EntityBlock.java
	common/buildcraft/core/lib/ITileBufferHolder.java
	common/buildcraft/core/lib/TileBuffer.java
	common/buildcraft/core/lib/block/BlockBuildCraft.java
	common/buildcraft/core/lib/block/BlockBuildCraftFluid.java
	common/buildcraft/core/lib/block/TileBuildCraft.java
	common/buildcraft/core/lib/commands/CommandHelpers.java
	common/buildcraft/core/lib/commands/IModCommand.java
	common/buildcraft/core/lib/commands/RootCommand.java
	common/buildcraft/core/lib/commands/SubCommand.java
	common/buildcraft/core/lib/engines/BlockEngineBase.java
	common/buildcraft/core/lib/engines/ItemEngine.java
	common/buildcraft/core/lib/engines/RenderEngine.java
	common/buildcraft/core/lib/engines/TileEngineBase.java
	common/buildcraft/core/lib/engines/TileEngineWithInventory.java
	common/buildcraft/core/lib/fluids/RestrictedTank.java
	common/buildcraft/core/lib/fluids/SingleUseTank.java
	common/buildcraft/core/lib/fluids/Tank.java
	common/buildcraft/core/lib/fluids/TankManager.java
	common/buildcraft/core/lib/fluids/TankUtils.java
	common/buildcraft/core/lib/gui/AdvancedSlot.java
	common/buildcraft/core/lib/gui/BuildCraftContainer.java
	common/buildcraft/core/lib/gui/FluidSlot.java
	common/buildcraft/core/lib/gui/GuiAdvancedInterface.java
	common/buildcraft/core/lib/gui/GuiBuildCraft.java
	common/buildcraft/core/lib/gui/GuiTools.java
	common/buildcraft/core/lib/gui/IInventorySlot.java
	common/buildcraft/core/lib/gui/ItemSlot.java
	common/buildcraft/core/lib/gui/StatementParameterSlot.java
	common/buildcraft/core/lib/gui/StatementSlot.java
	common/buildcraft/core/lib/gui/buttons/ButtonTextureSet.java
	common/buildcraft/core/lib/gui/buttons/GuiBetterButton.java
	common/buildcraft/core/lib/gui/buttons/GuiButtonSmall.java
	common/buildcraft/core/lib/gui/buttons/GuiImageButton.java
	common/buildcraft/core/lib/gui/buttons/GuiMultiButton.java
	common/buildcraft/core/lib/gui/buttons/GuiToggleButton.java
	common/buildcraft/core/lib/gui/buttons/GuiToggleButtonSmall.java
	common/buildcraft/core/lib/gui/buttons/IButtonClickEventListener.java
	common/buildcraft/core/lib/gui/buttons/IButtonClickEventTrigger.java
	common/buildcraft/core/lib/gui/buttons/IButtonTextureSet.java
	common/buildcraft/core/lib/gui/buttons/IMultiButtonState.java
	common/buildcraft/core/lib/gui/buttons/LockButtonState.java
	common/buildcraft/core/lib/gui/buttons/MultiButtonController.java
	common/buildcraft/core/lib/gui/buttons/StandardButtonTextureSets.java
	common/buildcraft/core/lib/gui/slots/IPhantomSlot.java
	common/buildcraft/core/lib/gui/slots/SlotBase.java
	common/buildcraft/core/lib/gui/slots/SlotHidden.java
	common/buildcraft/core/lib/gui/slots/SlotLimited.java
	common/buildcraft/core/lib/gui/slots/SlotOutput.java
	common/buildcraft/core/lib/gui/slots/SlotPhantom.java
	common/buildcraft/core/lib/gui/slots/SlotUntouchable.java
	common/buildcraft/core/lib/gui/slots/SlotValidated.java
	common/buildcraft/core/lib/gui/tooltips/IToolTipProvider.java
	common/buildcraft/core/lib/gui/tooltips/ToolTip.java
	common/buildcraft/core/lib/gui/tooltips/ToolTipLine.java
	common/buildcraft/core/lib/gui/widgets/ButtonWidget.java
	common/buildcraft/core/lib/gui/widgets/FluidGaugeWidget.java
	common/buildcraft/core/lib/gui/widgets/IIndicatorController.java
	common/buildcraft/core/lib/gui/widgets/IndicatorController.java
	common/buildcraft/core/lib/gui/widgets/IndicatorWidget.java
	common/buildcraft/core/lib/gui/widgets/Widget.java
	common/buildcraft/core/lib/inventory/CrafterCopy.java
	common/buildcraft/core/lib/inventory/FluidHandlerCopy.java
	common/buildcraft/core/lib/inventory/ITransactor.java
	common/buildcraft/core/lib/inventory/InvUtils.java
	common/buildcraft/core/lib/inventory/InventoryConcatenator.java
	common/buildcraft/core/lib/inventory/InventoryCopy.java
	common/buildcraft/core/lib/inventory/InventoryIterator.java
	common/buildcraft/core/lib/inventory/InventoryIteratorSided.java
	common/buildcraft/core/lib/inventory/InventoryIteratorSimple.java
	common/buildcraft/core/lib/inventory/InventoryMapper.java
	common/buildcraft/core/lib/inventory/InventoryWrapper.java
	common/buildcraft/core/lib/inventory/InventoryWrapperSimple.java
	common/buildcraft/core/lib/inventory/SimpleInventory.java
	common/buildcraft/core/lib/inventory/StackHelper.java
	common/buildcraft/core/lib/inventory/Transactor.java
	common/buildcraft/core/lib/inventory/TransactorRoundRobin.java
	common/buildcraft/core/lib/inventory/TransactorSimple.java
	common/buildcraft/core/lib/inventory/filters/AggregateFilter.java
	common/buildcraft/core/lib/inventory/filters/ArrayFluidFilter.java
	common/buildcraft/core/lib/inventory/filters/ArrayStackFilter.java
	common/buildcraft/core/lib/inventory/filters/ArrayStackOrListFilter.java
	common/buildcraft/core/lib/inventory/filters/CompositeFilter.java
	common/buildcraft/core/lib/inventory/filters/CraftingFilter.java
	common/buildcraft/core/lib/inventory/filters/IFluidFilter.java
	common/buildcraft/core/lib/inventory/filters/IStackFilter.java
	common/buildcraft/core/lib/inventory/filters/InvertedStackFilter.java
	common/buildcraft/core/lib/inventory/filters/OreStackFilter.java
	common/buildcraft/core/lib/inventory/filters/PassThroughFluidFilter.java
	common/buildcraft/core/lib/inventory/filters/PassThroughStackFilter.java
	common/buildcraft/core/lib/inventory/filters/SimpleFluidFilter.java
	common/buildcraft/core/lib/inventory/filters/StackFilter.java
	common/buildcraft/core/lib/inventory/filters/StatementParameterStackFilter.java
	common/buildcraft/core/lib/items/ItemBlockBuildCraft.java
	common/buildcraft/core/lib/items/ItemBuildCraft.java
	common/buildcraft/core/lib/network/ChannelHandler.java
	common/buildcraft/core/lib/network/IGuiReturnHandler.java
	common/buildcraft/core/lib/network/ISyncedTile.java
	common/buildcraft/core/lib/network/Packet.java
	common/buildcraft/core/lib/network/PacketCoordinates.java
	common/buildcraft/core/lib/network/PacketEntityUpdate.java
	common/buildcraft/core/lib/network/PacketGuiReturn.java
	common/buildcraft/core/lib/network/PacketGuiWidget.java
	common/buildcraft/core/lib/network/PacketHandler.java
	common/buildcraft/core/lib/network/PacketNBT.java
	common/buildcraft/core/lib/network/PacketSlotChange.java
	common/buildcraft/core/lib/network/PacketTileState.java
	common/buildcraft/core/lib/network/PacketTileUpdate.java
	common/buildcraft/core/lib/network/PacketUpdate.java
	common/buildcraft/core/lib/network/Serializable.java
	common/buildcraft/core/lib/network/command/CommandTarget.java
	common/buildcraft/core/lib/network/command/CommandTargetContainer.java
	common/buildcraft/core/lib/network/command/CommandTargetEntity.java
	common/buildcraft/core/lib/network/command/CommandTargetTile.java
	common/buildcraft/core/lib/network/command/CommandWriter.java
	common/buildcraft/core/lib/network/command/ICommandReceiver.java
	common/buildcraft/core/lib/network/command/PacketCommand.java
	common/buildcraft/core/lib/render/DynamicTextureBC.java
	common/buildcraft/core/lib/render/EntityDropParticleFX.java
	common/buildcraft/core/lib/render/FakeBlock.java
	common/buildcraft/core/lib/render/FluidRenderer.java
	common/buildcraft/core/lib/render/ICustomHighlight.java
	common/buildcraft/core/lib/render/IInventoryRenderer.java
	common/buildcraft/core/lib/render/ModelFrustum.java
	common/buildcraft/core/lib/render/RenderBlockComplex.java
	common/buildcraft/core/lib/render/RenderEntityBlock.java
	common/buildcraft/core/lib/render/RenderUtils.java
	common/buildcraft/core/lib/render/RenderVoid.java
	common/buildcraft/core/lib/render/SubIcon.java
	common/buildcraft/core/lib/render/TextureStateManager.java
	common/buildcraft/core/lib/utils/AverageDouble.java
	common/buildcraft/core/lib/utils/BlockMiner.java
	common/buildcraft/core/lib/utils/BlockScanner.java
	common/buildcraft/core/lib/utils/BlockUtils.java
	common/buildcraft/core/lib/utils/ColorUtils.java
	common/buildcraft/core/lib/utils/ConfigUtils.java
	common/buildcraft/core/lib/utils/CraftingUtils.java
	common/buildcraft/core/lib/utils/IBlockFilter.java
	common/buildcraft/core/lib/utils/IEntityFilter.java
	common/buildcraft/core/lib/utils/IIterableAlgorithm.java
	common/buildcraft/core/lib/utils/IterableAlgorithmRunner.java
	common/buildcraft/core/lib/utils/MathUtils.java
	common/buildcraft/core/lib/utils/MatrixTranformations.java
	common/buildcraft/core/lib/utils/NBTUtils.java
	common/buildcraft/core/lib/utils/PathFinding.java
	common/buildcraft/core/lib/utils/PathFindingSearch.java
	common/buildcraft/core/lib/utils/ResourceUtils.java
	common/buildcraft/core/lib/utils/RevolvingList.java
	common/buildcraft/core/lib/utils/SessionVars.java
	common/buildcraft/core/lib/utils/SimplexNoise.java
	common/buildcraft/core/lib/utils/StringUtils.java
	common/buildcraft/core/lib/utils/Utils.java
	common/buildcraft/core/lib/utils/XorShift128Random.java
	common/buildcraft/core/list/ContainerListOld.java
	common/buildcraft/core/list/GuiListOld.java
	common/buildcraft/core/network/EntityIds.java
	common/buildcraft/core/network/PacketHandlerCore.java
	common/buildcraft/core/network/PacketIds.java
	common/buildcraft/core/properties/ChunkProperty.java
	common/buildcraft/core/properties/DimensionProperty.java
	common/buildcraft/core/properties/WorldProperty.java
	common/buildcraft/core/properties/WorldPropertyIsDirt.java
	common/buildcraft/core/properties/WorldPropertyIsFarmland.java
	common/buildcraft/core/properties/WorldPropertyIsFluidSource.java
	common/buildcraft/core/properties/WorldPropertyIsHarvestable.java
	common/buildcraft/core/properties/WorldPropertyIsLeaf.java
	common/buildcraft/core/properties/WorldPropertyIsOre.java
	common/buildcraft/core/properties/WorldPropertyIsShoveled.java
	common/buildcraft/core/properties/WorldPropertyIsSoft.java
	common/buildcraft/core/properties/WorldPropertyIsWood.java
	common/buildcraft/core/proxy/CoreProxy.java
	common/buildcraft/core/proxy/CoreProxyClient.java
	common/buildcraft/core/recipes/AssemblyRecipeManager.java
	common/buildcraft/core/recipes/FlexibleRecipe.java
	common/buildcraft/core/recipes/IntegrationRecipeManager.java
	common/buildcraft/core/recipes/RecipeManager.java
	common/buildcraft/core/recipes/RefineryRecipeManager.java
	common/buildcraft/core/render/BlockHighlightHandler.java
	common/buildcraft/core/render/RenderBox.java
	common/buildcraft/core/render/RenderBoxProvider.java
	common/buildcraft/core/render/RenderBuilder.java
	common/buildcraft/core/render/RenderBuildingItems.java
	common/buildcraft/core/render/RenderLEDTile.java
	common/buildcraft/core/render/RenderLaser.java
	common/buildcraft/core/render/RenderingEntityBlocks.java
	common/buildcraft/core/render/RenderingMarkers.java
	common/buildcraft/core/statements/ActionMachineControl.java
	common/buildcraft/core/statements/ActionRedstoneOutput.java
	common/buildcraft/core/statements/BCStatement.java
	common/buildcraft/core/statements/DefaultActionProvider.java
	common/buildcraft/core/statements/DefaultTriggerProvider.java
	common/buildcraft/core/statements/StatementParameterDirection.java
	common/buildcraft/core/statements/TriggerEnergy.java
	common/buildcraft/core/statements/TriggerFluidContainer.java
	common/buildcraft/core/statements/TriggerFluidContainerLevel.java
	common/buildcraft/core/statements/TriggerInventory.java
	common/buildcraft/core/statements/TriggerInventoryLevel.java
	common/buildcraft/core/statements/TriggerMachine.java
	common/buildcraft/core/statements/TriggerRedstoneInput.java
	common/buildcraft/core/tablet/ItemTablet.java
	common/buildcraft/core/tablet/TabletClient.java
	common/buildcraft/core/tablet/TabletServer.java
	common/buildcraft/core/tablet/manager/TabletManagerServer.java
	common/buildcraft/core/tablet/utils/TabletFont.java
	common/buildcraft/energy/BucketHandler.java
	common/buildcraft/energy/EnergyGuiHandler.java
	common/buildcraft/energy/EnergyProxy.java
	common/buildcraft/energy/EnergyProxyClient.java
	common/buildcraft/energy/IMCHandlerEnergy.java
	common/buildcraft/energy/ItemBucketBuildcraft.java
	common/buildcraft/energy/TileEngineCreative.java
	common/buildcraft/energy/TileEngineIron.java
	common/buildcraft/energy/TileEngineStone.java
	common/buildcraft/energy/fuels/CoolantManager.java
	common/buildcraft/energy/fuels/FuelManager.java
	common/buildcraft/energy/gui/ContainerEngine.java
	common/buildcraft/energy/gui/GuiCombustionEngine.java
	common/buildcraft/energy/gui/GuiEngine.java
	common/buildcraft/energy/gui/GuiStoneEngine.java
	common/buildcraft/energy/statements/EnergyStatementProvider.java
	common/buildcraft/energy/statements/TriggerEngineHeat.java
	common/buildcraft/energy/worldgen/BiomeGenOilDesert.java
	common/buildcraft/energy/worldgen/BiomeGenOilOcean.java
	common/buildcraft/energy/worldgen/BiomeInitializer.java
	common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java
	common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java
	common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java
	common/buildcraft/energy/worldgen/OilPopulate.java
	common/buildcraft/factory/BlockAutoWorkbench.java
	common/buildcraft/factory/BlockFloodGate.java
	common/buildcraft/factory/BlockHopper.java
	common/buildcraft/factory/BlockMiningWell.java
	common/buildcraft/factory/BlockPlainPipe.java
	common/buildcraft/factory/BlockPump.java
	common/buildcraft/factory/BlockRefinery.java
	common/buildcraft/factory/BlockTank.java
	common/buildcraft/factory/FactoryGuiHandler.java
	common/buildcraft/factory/FactoryProxy.java
	common/buildcraft/factory/FactoryProxyClient.java
	common/buildcraft/factory/PumpDimensionList.java
	common/buildcraft/factory/TileAutoWorkbench.java
	common/buildcraft/factory/TileFloodGate.java
	common/buildcraft/factory/TileHopper.java
	common/buildcraft/factory/TileMiningWell.java
	common/buildcraft/factory/TilePump.java
	common/buildcraft/factory/TileRefinery.java
	common/buildcraft/factory/TileTank.java
	common/buildcraft/factory/gui/ContainerAutoWorkbench.java
	common/buildcraft/factory/gui/ContainerHopper.java
	common/buildcraft/factory/gui/ContainerRefinery.java
	common/buildcraft/factory/gui/GuiAutoCrafting.java
	common/buildcraft/factory/gui/GuiHopper.java
	common/buildcraft/factory/gui/GuiRefinery.java
	common/buildcraft/factory/gui/SlotWorkbench.java
	common/buildcraft/factory/render/RenderHopper.java
	common/buildcraft/factory/render/RenderRefinery.java
	common/buildcraft/factory/render/RenderTank.java
	common/buildcraft/factory/schematics/SchematicAutoWorkbench.java
	common/buildcraft/factory/schematics/SchematicPump.java
	common/buildcraft/factory/schematics/SchematicRefinery.java
	common/buildcraft/factory/schematics/SchematicTileIgnoreState.java
	common/buildcraft/robotics/BlockRequester.java
	common/buildcraft/robotics/BlockZonePlan.java
	common/buildcraft/robotics/DockingStationPipe.java
	common/buildcraft/robotics/EntityRobot.java
	common/buildcraft/robotics/EntityRobotEnergyParticle.java
	common/buildcraft/robotics/IStationFilter.java
	common/buildcraft/robotics/ImplRedstoneBoardRegistry.java
	common/buildcraft/robotics/ItemRedstoneBoard.java
	common/buildcraft/robotics/ItemRobot.java
	common/buildcraft/robotics/ItemRobotStation.java
	common/buildcraft/robotics/RobotIntegrationRecipe.java
	common/buildcraft/robotics/RobotRegistry.java
	common/buildcraft/robotics/RobotStationPluggable.java
	common/buildcraft/robotics/RobotUtils.java
	common/buildcraft/robotics/RoboticsGuiHandler.java
	common/buildcraft/robotics/RoboticsProxy.java
	common/buildcraft/robotics/RoboticsProxyClient.java
	common/buildcraft/robotics/StationIndex.java
	common/buildcraft/robotics/TileRequester.java
	common/buildcraft/robotics/TileZonePlan.java
	common/buildcraft/robotics/ZoneChunk.java
	common/buildcraft/robotics/ZonePlan.java
	common/buildcraft/robotics/ai/AIRobotAttack.java
	common/buildcraft/robotics/ai/AIRobotBreak.java
	common/buildcraft/robotics/ai/AIRobotDeliverRequested.java
	common/buildcraft/robotics/ai/AIRobotDisposeItems.java
	common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java
	common/buildcraft/robotics/ai/AIRobotFetchItem.java
	common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java
	common/buildcraft/robotics/ai/AIRobotGoto.java
	common/buildcraft/robotics/ai/AIRobotGotoBlock.java
	common/buildcraft/robotics/ai/AIRobotGotoSleep.java
	common/buildcraft/robotics/ai/AIRobotGotoStation.java
	common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java
	common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java
	common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java
	common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java
	common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java
	common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java
	common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java
	common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java
	common/buildcraft/robotics/ai/AIRobotLoad.java
	common/buildcraft/robotics/ai/AIRobotLoadFluids.java
	common/buildcraft/robotics/ai/AIRobotMain.java
	common/buildcraft/robotics/ai/AIRobotPlant.java
	common/buildcraft/robotics/ai/AIRobotPumpBlock.java
	common/buildcraft/robotics/ai/AIRobotRecharge.java
	common/buildcraft/robotics/ai/AIRobotSearchAndGotoBlock.java
	common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java
	common/buildcraft/robotics/ai/AIRobotSearchBlock.java
	common/buildcraft/robotics/ai/AIRobotSearchEntity.java
	common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java
	common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java
	common/buildcraft/robotics/ai/AIRobotSearchStation.java
	common/buildcraft/robotics/ai/AIRobotShutdown.java
	common/buildcraft/robotics/ai/AIRobotSleep.java
	common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java
	common/buildcraft/robotics/ai/AIRobotStripesHandler.java
	common/buildcraft/robotics/ai/AIRobotUnload.java
	common/buildcraft/robotics/ai/AIRobotUnloadFluids.java
	common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java
	common/buildcraft/robotics/boards/BCBoardNBT.java
	common/buildcraft/robotics/boards/BoardRobotBomber.java
	common/buildcraft/robotics/boards/BoardRobotBuilder.java
	common/buildcraft/robotics/boards/BoardRobotButcher.java
	common/buildcraft/robotics/boards/BoardRobotCarrier.java
	common/buildcraft/robotics/boards/BoardRobotDelivery.java
	common/buildcraft/robotics/boards/BoardRobotFarmer.java
	common/buildcraft/robotics/boards/BoardRobotFluidCarrier.java
	common/buildcraft/robotics/boards/BoardRobotGenericBreakBlock.java
	common/buildcraft/robotics/boards/BoardRobotHarvester.java
	common/buildcraft/robotics/boards/BoardRobotKnight.java
	common/buildcraft/robotics/boards/BoardRobotLeaveCutter.java
	common/buildcraft/robotics/boards/BoardRobotLumberjack.java
	common/buildcraft/robotics/boards/BoardRobotMiner.java
	common/buildcraft/robotics/boards/BoardRobotPicker.java
	common/buildcraft/robotics/boards/BoardRobotPlanter.java
	common/buildcraft/robotics/boards/BoardRobotPump.java
	common/buildcraft/robotics/boards/BoardRobotShovelman.java
	common/buildcraft/robotics/boards/BoardRobotStripes.java
	common/buildcraft/robotics/gui/ContainerRequester.java
	common/buildcraft/robotics/gui/ContainerZonePlan.java
	common/buildcraft/robotics/gui/GuiRequester.java
	common/buildcraft/robotics/gui/GuiZonePlan.java
	common/buildcraft/robotics/map/MapChunk.java
	common/buildcraft/robotics/map/MapManager.java
	common/buildcraft/robotics/map/MapWorld.java
	common/buildcraft/robotics/render/RenderRobot.java
	common/buildcraft/robotics/render/RobotStationItemRenderer.java
	common/buildcraft/robotics/statements/ActionRobotFilter.java
	common/buildcraft/robotics/statements/ActionRobotFilterTool.java
	common/buildcraft/robotics/statements/ActionRobotGotoStation.java
	common/buildcraft/robotics/statements/ActionRobotWakeUp.java
	common/buildcraft/robotics/statements/ActionRobotWorkInArea.java
	common/buildcraft/robotics/statements/ActionStationAcceptFluids.java
	common/buildcraft/robotics/statements/ActionStationAcceptItems.java
	common/buildcraft/robotics/statements/ActionStationForbidRobot.java
	common/buildcraft/robotics/statements/ActionStationInputItems.java
	common/buildcraft/robotics/statements/ActionStationProvideFluids.java
	common/buildcraft/robotics/statements/ActionStationProvideItems.java
	common/buildcraft/robotics/statements/ActionStationRequestItems.java
	common/buildcraft/robotics/statements/ActionStationRequestItemsMachine.java
	common/buildcraft/robotics/statements/RobotsActionProvider.java
	common/buildcraft/robotics/statements/RobotsTriggerProvider.java
	common/buildcraft/robotics/statements/StateStationProvideItems.java
	common/buildcraft/robotics/statements/StateStationRequestItems.java
	common/buildcraft/robotics/statements/TriggerRobotInStation.java
	common/buildcraft/robotics/statements/TriggerRobotLinked.java
	common/buildcraft/robotics/statements/TriggerRobotSleep.java
	common/buildcraft/silicon/BlockLaser.java
	common/buildcraft/silicon/BlockLaserTable.java
	common/buildcraft/silicon/ItemLaserTable.java
	common/buildcraft/silicon/ItemPackage.java
	common/buildcraft/silicon/ItemRedstoneChipset.java
	common/buildcraft/silicon/ResourceIdAssemblyTable.java
	common/buildcraft/silicon/SiliconGuiHandler.java
	common/buildcraft/silicon/SiliconProxy.java
	common/buildcraft/silicon/SiliconProxyClient.java
	common/buildcraft/silicon/TileAdvancedCraftingTable.java
	common/buildcraft/silicon/TileAssemblyTable.java
	common/buildcraft/silicon/TileChargingTable.java
	common/buildcraft/silicon/TileIntegrationTable.java
	common/buildcraft/silicon/TileLaser.java
	common/buildcraft/silicon/TileLaserTableBase.java
	common/buildcraft/silicon/TilePackager.java
	common/buildcraft/silicon/TileProgrammingTable.java
	common/buildcraft/silicon/TileStampingTable.java
	common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java
	common/buildcraft/silicon/gui/ContainerAssemblyTable.java
	common/buildcraft/silicon/gui/ContainerChargingTable.java
	common/buildcraft/silicon/gui/ContainerIntegrationTable.java
	common/buildcraft/silicon/gui/ContainerPackager.java
	common/buildcraft/silicon/gui/ContainerProgrammingTable.java
	common/buildcraft/silicon/gui/ContainerStampingTable.java
	common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java
	common/buildcraft/silicon/gui/GuiAssemblyTable.java
	common/buildcraft/silicon/gui/GuiChargingTable.java
	common/buildcraft/silicon/gui/GuiIntegrationTable.java
	common/buildcraft/silicon/gui/GuiLaserTable.java
	common/buildcraft/silicon/gui/GuiPackager.java
	common/buildcraft/silicon/gui/GuiProgrammingTable.java
	common/buildcraft/silicon/gui/GuiStampingTable.java
	common/buildcraft/silicon/gui/SlotPackager.java
	common/buildcraft/silicon/network/PacketHandlerSilicon.java
	common/buildcraft/silicon/render/PackageFontRenderer.java
	common/buildcraft/silicon/render/RenderLaserBlock.java
	common/buildcraft/silicon/render/RenderLaserTable.java
	common/buildcraft/silicon/render/RenderLaserTile.java
	common/buildcraft/silicon/schematics/SchematicLaserTableBase.java
	common/buildcraft/transport/ActionActiveState.java
	common/buildcraft/transport/BlockFilteredBuffer.java
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/FacadePluggable.java
	common/buildcraft/transport/Gate.java
	common/buildcraft/transport/IDiamondPipe.java
	common/buildcraft/transport/IEmeraldPipe.java
	common/buildcraft/transport/IFilteredPipe.java
	common/buildcraft/transport/IMCHandlerTransport.java
	common/buildcraft/transport/IPipeConnectionForced.java
	common/buildcraft/transport/IPipeTransportFluidsHook.java
	common/buildcraft/transport/IPipeTransportPowerHook.java
	common/buildcraft/transport/ISolidSideTile.java
	common/buildcraft/transport/ItemFacade.java
	common/buildcraft/transport/ItemGateCopier.java
	common/buildcraft/transport/ItemPipe.java
	common/buildcraft/transport/ItemPipeWire.java
	common/buildcraft/transport/LensFilterHandler.java
	common/buildcraft/transport/Pipe.java
	common/buildcraft/transport/PipeActionProvider.java
	common/buildcraft/transport/PipeConnectionBans.java
	common/buildcraft/transport/PipeIconProvider.java
	common/buildcraft/transport/PipeRenderState.java
	common/buildcraft/transport/PipeToolTipManager.java
	common/buildcraft/transport/PipeTransport.java
	common/buildcraft/transport/PipeTransportFluids.java
	common/buildcraft/transport/PipeTransportItems.java
	common/buildcraft/transport/PipeTransportPower.java
	common/buildcraft/transport/PipeTransportStructure.java
	common/buildcraft/transport/PipeTriggerProvider.java
	common/buildcraft/transport/TileFilteredBuffer.java
	common/buildcraft/transport/TileGenericPipe.java
	common/buildcraft/transport/TransportConstants.java
	common/buildcraft/transport/TransportGuiHandler.java
	common/buildcraft/transport/TransportProxy.java
	common/buildcraft/transport/TransportProxyClient.java
	common/buildcraft/transport/TransportSiliconRecipes.java
	common/buildcraft/transport/TravelerSet.java
	common/buildcraft/transport/TravelingItem.java
	common/buildcraft/transport/WireIconProvider.java
	common/buildcraft/transport/gates/ActionIterator.java
	common/buildcraft/transport/gates/GateDefinition.java
	common/buildcraft/transport/gates/GateExpansionBuildcraft.java
	common/buildcraft/transport/gates/GateExpansionLightSensor.java
	common/buildcraft/transport/gates/GateExpansionNote.java
	common/buildcraft/transport/gates/GateExpansionPulsar.java
	common/buildcraft/transport/gates/GateExpansionRedstoneFader.java
	common/buildcraft/transport/gates/GateExpansionTimer.java
	common/buildcraft/transport/gates/GateFactory.java
	common/buildcraft/transport/gates/GatePluggable.java
	common/buildcraft/transport/gates/ItemGate.java
	common/buildcraft/transport/gui/ContainerDiamondPipe.java
	common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java
	common/buildcraft/transport/gui/ContainerEmeraldPipe.java
	common/buildcraft/transport/gui/ContainerEmzuliPipe.java
	common/buildcraft/transport/gui/ContainerFilteredBuffer.java
	common/buildcraft/transport/gui/ContainerGateInterface.java
	common/buildcraft/transport/gui/GuiDiamondPipe.java
	common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java
	common/buildcraft/transport/gui/GuiEmeraldPipe.java
	common/buildcraft/transport/gui/GuiEmzuliPipe.java
	common/buildcraft/transport/gui/GuiFilteredBuffer.java
	common/buildcraft/transport/gui/GuiGateInterface.java
	common/buildcraft/transport/network/PacketFluidUpdate.java
	common/buildcraft/transport/network/PacketHandlerTransport.java
	common/buildcraft/transport/network/PacketPipeTransportItemStack.java
	common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java
	common/buildcraft/transport/network/PacketPipeTransportTraveler.java
	common/buildcraft/transport/network/PacketPowerUpdate.java
	common/buildcraft/transport/pipes/PipeFluidsCobblestone.java
	common/buildcraft/transport/pipes/PipeFluidsDiamond.java
	common/buildcraft/transport/pipes/PipeFluidsEmerald.java
	common/buildcraft/transport/pipes/PipeFluidsGold.java
	common/buildcraft/transport/pipes/PipeFluidsIron.java
	common/buildcraft/transport/pipes/PipeFluidsQuartz.java
	common/buildcraft/transport/pipes/PipeFluidsSandstone.java
	common/buildcraft/transport/pipes/PipeFluidsStone.java
	common/buildcraft/transport/pipes/PipeFluidsVoid.java
	common/buildcraft/transport/pipes/PipeFluidsWood.java
	common/buildcraft/transport/pipes/PipeItemsClay.java
	common/buildcraft/transport/pipes/PipeItemsCobblestone.java
	common/buildcraft/transport/pipes/PipeItemsDaizuli.java
	common/buildcraft/transport/pipes/PipeItemsDiamond.java
	common/buildcraft/transport/pipes/PipeItemsEmerald.java
	common/buildcraft/transport/pipes/PipeItemsEmzuli.java
	common/buildcraft/transport/pipes/PipeItemsGold.java
	common/buildcraft/transport/pipes/PipeItemsIron.java
	common/buildcraft/transport/pipes/PipeItemsLapis.java
	common/buildcraft/transport/pipes/PipeItemsObsidian.java
	common/buildcraft/transport/pipes/PipeItemsQuartz.java
	common/buildcraft/transport/pipes/PipeItemsSandstone.java
	common/buildcraft/transport/pipes/PipeItemsStone.java
	common/buildcraft/transport/pipes/PipeItemsStripes.java
	common/buildcraft/transport/pipes/PipeItemsVoid.java
	common/buildcraft/transport/pipes/PipeItemsWood.java
	common/buildcraft/transport/pipes/PipeLogicIron.java
	common/buildcraft/transport/pipes/PipeLogicWood.java
	common/buildcraft/transport/pipes/PipePowerCobblestone.java
	common/buildcraft/transport/pipes/PipePowerDiamond.java
	common/buildcraft/transport/pipes/PipePowerEmerald.java
	common/buildcraft/transport/pipes/PipePowerGold.java
	common/buildcraft/transport/pipes/PipePowerIron.java
	common/buildcraft/transport/pipes/PipePowerQuartz.java
	common/buildcraft/transport/pipes/PipePowerSandstone.java
	common/buildcraft/transport/pipes/PipePowerStone.java
	common/buildcraft/transport/pipes/PipePowerWood.java
	common/buildcraft/transport/pipes/PipeStructureCobblestone.java
	common/buildcraft/transport/pipes/events/PipeEvent.java
	common/buildcraft/transport/pipes/events/PipeEventFluid.java
	common/buildcraft/transport/pipes/events/PipeEventItem.java
	common/buildcraft/transport/pipes/events/PipeEventPower.java
	common/buildcraft/transport/pluggable/ItemLens.java
	common/buildcraft/transport/pluggable/ItemPlug.java
	common/buildcraft/transport/pluggable/ItemPowerAdapter.java
	common/buildcraft/transport/pluggable/LensPluggable.java
	common/buildcraft/transport/pluggable/PlugPluggable.java
	common/buildcraft/transport/pluggable/PowerAdapterPluggable.java
	common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java
	common/buildcraft/transport/recipes/GateExpansionRecipe.java
	common/buildcraft/transport/render/FacadeBlockAccess.java
	common/buildcraft/transport/render/FacadeItemRenderer.java
	common/buildcraft/transport/render/FacadeRenderHelper.java
	common/buildcraft/transport/render/GateItemRenderer.java
	common/buildcraft/transport/render/PipeItemRenderer.java
	common/buildcraft/transport/render/PipeRendererTESR.java
	common/buildcraft/transport/render/PipeRendererWorld.java
	common/buildcraft/transport/render/PlugItemRenderer.java
	common/buildcraft/transport/render/TileEntityPickupFX.java
	common/buildcraft/transport/schematics/BptPipeExtension.java
	common/buildcraft/transport/schematics/BptPipeFiltered.java
	common/buildcraft/transport/schematics/BptPipeRotatable.java
	common/buildcraft/transport/schematics/BptPipeWooden.java
	common/buildcraft/transport/schematics/SchematicPipe.java
	common/buildcraft/transport/statements/ActionEnergyPulsar.java
	common/buildcraft/transport/statements/ActionExtractionPreset.java
	common/buildcraft/transport/statements/ActionParameterSignal.java
	common/buildcraft/transport/statements/ActionPipeColor.java
	common/buildcraft/transport/statements/ActionPipeDirection.java
	common/buildcraft/transport/statements/ActionPowerLimiter.java
	common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java
	common/buildcraft/transport/statements/ActionSignalOutput.java
	common/buildcraft/transport/statements/ActionSingleEnergyPulse.java
	common/buildcraft/transport/statements/ActionValve.java
	common/buildcraft/transport/statements/TriggerClockTimer.java
	common/buildcraft/transport/statements/TriggerLightSensor.java
	common/buildcraft/transport/statements/TriggerParameterSignal.java
	common/buildcraft/transport/statements/TriggerPipeContents.java
	common/buildcraft/transport/statements/TriggerPipeSignal.java
	common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java
	common/buildcraft/transport/stripes/PipeExtensionListener.java
	common/buildcraft/transport/stripes/StripesHandlerArrow.java
	common/buildcraft/transport/stripes/StripesHandlerBucket.java
	common/buildcraft/transport/stripes/StripesHandlerDispenser.java
	common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java
	common/buildcraft/transport/stripes/StripesHandlerHoe.java
	common/buildcraft/transport/stripes/StripesHandlerMinecartDestroy.java
	common/buildcraft/transport/stripes/StripesHandlerPipeWires.java
	common/buildcraft/transport/stripes/StripesHandlerPipes.java
	common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java
	common/buildcraft/transport/stripes/StripesHandlerRightClick.java
	common/buildcraft/transport/utils/BitSetCodec.java
	common/buildcraft/transport/utils/ConnectionMatrix.java
	common/buildcraft/transport/utils/FluidRenderData.java
	common/buildcraft/transport/utils/TextureMatrix.java
	common/buildcraft/transport/utils/TransportUtils.java
	common/buildcraft/transport/utils/WireMatrix.java
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	misc/unused_textures/autoWorkbenchSide_alt.png
	misc/unused_textures/pumpTop_alt.png
	misc/unused_textures/pumpTop_alt2.png
	misc/unused_textures/zoneplanner_front_on.png
  • Loading branch information
AlexIIL committed Dec 7, 2015
2 parents d331cd5 + ec91c2e commit 9d0d3d4
Show file tree
Hide file tree
Showing 1,315 changed files with 13,325 additions and 8,181 deletions.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,15 @@ this repository will have to be rejected.

Add the following to your build.gradle file:
```
repositories {
ivy {
name "BuildCraft"
artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
}
}
dependencies {
compile 'com.mod-buildcraft:buildcraft:6.1.8:dev'
compile name: "buildcraft", version: "7.0.7", classifier: "dev"
}
```
Where `6.1.8` is the desired version of BuildCraft.
Where `7.0.7` is the desired version of BuildCraft.
1 change: 1 addition & 0 deletions api/buildcraft/api/blueprints/BuilderAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

public final class BuilderAPI {
public static ISchematicRegistry schematicRegistry;
public static ISchematicHelper schematicHelper;

public static final int BREAK_ENERGY = 160;
public static final int BUILD_ENERGY = 240;
Expand Down
7 changes: 7 additions & 0 deletions api/buildcraft/api/blueprints/ISchematicHelper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package buildcraft.api.blueprints;

import net.minecraft.item.ItemStack;

public interface ISchematicHelper {
boolean isEqualItem(ItemStack a, ItemStack b);
}
32 changes: 19 additions & 13 deletions api/buildcraft/api/blueprints/Schematic.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import java.util.LinkedList;

import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
Expand All @@ -29,17 +28,22 @@
public abstract class Schematic {
/** Blocks are build in various stages, in order to make sure that a block can indeed be placed, and that it's
* unlikely to disturb other blocks. */
public static enum BuildingStage {
/** Standalone blocks can be placed in the air, and they don't change once placed. */
public enum BuildingStage {
/** Standalone blocks do not change once placed. */
STANDALONE,

/** Supported blocks may require to be placed on a standalone block, e.g. a torch. */
SUPPORTED,

/** Expanding blocks will grow and may disturb other block locations, like e.g. water */
/** Expanding blocks will grow and may disturb other block locations, like liquids. */
EXPANDING
}

/** This is called to verify whether the required item is equal to the supplied item.
*
* Primarily rely on this for checking metadata/NBT - the item ID itself might have been filtered out by previously
* running code. */
public boolean isItemMatchingRequirement(ItemStack suppliedStack, ItemStack requiredStack) {
return BuilderAPI.schematicHelper.isEqualItem(suppliedStack, requiredStack);
}

/** This is called each time an item matches a requirement. By default, it will increase damage of items that can be
* damaged by the amount of the requirement, and remove the intended amount of items that can't be damaged.
*
Expand Down Expand Up @@ -75,12 +79,14 @@ public ItemStack useItem(IBuilderContext context, ItemStack req, IInvSlot slot)
}
}

if (stack.stackSize == 0 && stack.getItem().getContainerItem() != null) {
Item container = stack.getItem().getContainerItem();
ItemStack newStack = new ItemStack(container);
slot.setStackInSlot(newStack);
} else if (stack.stackSize == 0) {
slot.setStackInSlot(null);
if (stack.stackSize == 0) {
stack.stackSize = 1;
if (stack.getItem().hasContainerItem(stack)) {
ItemStack newStack = stack.getItem().getContainerItem(stack);
slot.setStackInSlot(newStack);
} else {
slot.setStackInSlot(null);
}
}

return result;
Expand Down
51 changes: 25 additions & 26 deletions api/buildcraft/api/blueprints/SchematicBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
* should be located as "LICENSE.API" in the BuildCraft source code distribution. */
package buildcraft.api.blueprints;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.*;

import net.minecraft.block.Block;
import net.minecraft.block.BlockFalling;
Expand All @@ -21,11 +17,11 @@
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumFacing.Axis;

import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fluids.BlockFluidBase;

public class SchematicBlock extends SchematicBlockBase {

public IBlockState state = null;
public BuildingPermission defaultPermission = BuildingPermission.ALL;

Expand Down Expand Up @@ -90,17 +86,21 @@ public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) {
}
}

/** Get a list of relative block coordinates which have to be built before this block can be placed. */
public Set<BlockPos> getPrerequisiteBlocks(IBuilderContext context) {
Set<BlockPos> indexes = new HashSet<BlockPos>();
if (state.getBlock() instanceof BlockFalling) {
indexes.add(new BlockPos(0, -1, 0));
}
return indexes;
}

@Override
public BuildingStage getBuildStage() {
Block block = state.getBlock();
if (block instanceof BlockFalling) {
return BuildingStage.SUPPORTED;
} else if (block instanceof BlockFluidBase || block instanceof BlockLiquid) {
if (state.getBlock() instanceof BlockFluidBase || state.getBlock() instanceof BlockLiquid) {
return BuildingStage.EXPANDING;
} else if (block.isOpaqueCube()) {
return BuildingStage.STANDALONE;
} else {
return BuildingStage.SUPPORTED;
return BuildingStage.STANDALONE;
}
}

Expand Down Expand Up @@ -183,25 +183,24 @@ protected ItemStack getItemStack(IBlockState state) {
return getItemStack(state, 1);
}

public EnumFacing getFace(IProperty prop) {
return (EnumFacing) state.getValue(prop);
}

// Pretty much all blocks (that rotate) rotate this way now
@Override
public void rotateLeft(IBuilderContext context) {
@SuppressWarnings("unchecked")
IProperty<EnumFacing> facingProp = getFacingProp();
if (facingProp != null) {
EnumFacing face = state.getValue(facingProp);
if (face.getAxis() == Axis.Y) return;
state = state.withProperty(facingProp, face.rotateY());
}
}

protected IProperty<EnumFacing> getFacingProp() {
Collection<IProperty> props = state.getPropertyNames();
for (IProperty prop : props) {
if ("facing".equals(prop.getName())) {
EnumFacing face = getFace(prop);
if (face.getAxis() == Axis.Y) {
// Don't attempt to rotate if its facing up or down
break;
}
state = state.withProperty(prop, face.rotateY());
break;
if ("facing".equals(prop.getName()) && state.getValue(prop) instanceof EnumFacing) {
return prop;
}
}
return null;
}
}
21 changes: 17 additions & 4 deletions api/buildcraft/api/blueprints/SchematicMask.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

import java.util.LinkedList;

import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.BlockPos;
Expand Down Expand Up @@ -34,13 +37,23 @@ public void placeInWorld(IBuilderContext context, BlockPos pos, LinkedList<ItemS
return;
} else {
ItemStack stack = stacks.getFirst();
EntityPlayer player = BuildCraftAPI.proxy.getBuildCraftPlayer((WorldServer) context.world()).get();

// force the block to be air block, in case it's just a soft
// block which replacement is not straightforward
context.world().setBlockToAir(pos);

stack.onItemUse(BuildCraftAPI.proxy.getBuildCraftPlayer((WorldServer) context.world()).get(), context.world(), pos, EnumFacing.UP,
0.0f, 0.0f, 0.0f);
// Find nearest solid surface to place on
for (EnumFacing face : EnumFacing.values()) {
BlockPos offset = pos.offset(face);
if (!BuildCraftAPI.isSoftBlock(context.world(), offset)) {
ItemBlock itemBlock = (ItemBlock) stack.getItem();
IBlockState state = itemBlock.block.onBlockPlaced(context.world(), pos, face, 0, 0, 0, stack.getMetadata(), player);
itemBlock.placeBlockAt(stack, player, context.world(), offset, face, 0, 0, 0, state);
continue;
}
}

}
} else {
context.world().setBlockToAir(pos);
Expand All @@ -50,9 +63,9 @@ public void placeInWorld(IBuilderContext context, BlockPos pos, LinkedList<ItemS
@Override
public boolean isAlreadyBuilt(IBuilderContext context, BlockPos pos) {
if (isConcrete) {
return !BuildCraftAPI.isSoftBlock(context.world(), pos);
return !BuildCraftAPI.getWorldProperty("replaceable").get(context.world(), pos);
} else {
return BuildCraftAPI.isSoftBlock(context.world(), pos);
return BuildCraftAPI.getWorldProperty("replaceable").get(context.world(), pos);
}
}

Expand Down
8 changes: 8 additions & 0 deletions api/buildcraft/api/blueprints/SchematicTile.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public void idsToWorld(MappingRegistry registry) {
}
}

public void onNBTLoaded() {

}

/** Places the block in the world, at the location specified in the slot. */
@Override
public void placeInWorld(IBuilderContext context, BlockPos pos, LinkedList<ItemStack> stacks) {
Expand All @@ -59,6 +63,9 @@ public void initializeFromObjectAt(IBuilderContext context, BlockPos pos) {
if (tile != null) {
tile.writeToNBT(tileNBT);
}

tileNBT = (NBTTagCompound) tileNBT.copy();
onNBTLoaded();
}
}

Expand Down Expand Up @@ -97,6 +104,7 @@ public void readSchematicFromNBT(NBTTagCompound nbt, MappingRegistry registry) {
super.readSchematicFromNBT(nbt, registry);

tileNBT = nbt.getCompoundTag("blockCpt");
onNBTLoaded();
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions api/buildcraft/api/blueprints/package-info.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/** Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team http://www.mod-buildcraft.com
*
* The BuildCraft API is distributed under the terms of the MIT License. Please check the contents of the license, which
* should be located as "LICENSE.API" in the BuildCraft source code distribution. */
@API(apiVersion = "1.3", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
* The BuildCraft API is distributed under the terms of the MIT License.
* Please check the contents of the license, which should be located
* as "LICENSE.API" in the BuildCraft source code distribution.
*/
@API(apiVersion = "1.5", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
package buildcraft.api.blueprints;

import net.minecraftforge.fml.common.API;
30 changes: 9 additions & 21 deletions api/buildcraft/api/core/BCLog.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,24 @@
* should be located as "LICENSE.API" in the BuildCraft source code distribution. */
package buildcraft.api.core;

import java.lang.reflect.Method;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public final class BCLog {

public static final Logger logger = LogManager.getLogger("BuildCraft");

/** Deactivate constructor */
private BCLog() {}

public static void initLog() {

logger.info("Starting BuildCraft " + getVersion());
logger.info("Copyright (c) SpaceToad, 2011-2015");
logger.info("http://www.mod-buildcraft.com");
@Deprecated
public static void logErrorAPI(String mod, Throwable error, Class<?> classFile) {
logErrorAPI(error, classFile);
}

public static void logErrorAPI(String mod, Throwable error, Class<?> classFile) {
StringBuilder msg = new StringBuilder(mod);
msg.append(" API error, please update your mods. Error: ").append(error);
public static void logErrorAPI(Throwable error, Class<?> classFile) {
StringBuilder msg = new StringBuilder("API error! Please update your mods. Error: ");
msg.append(error);
StackTraceElement[] stackTrace = error.getStackTrace();
if (stackTrace.length > 0) {
msg.append(", ").append(stackTrace[0]);
Expand All @@ -35,20 +30,13 @@ public static void logErrorAPI(String mod, Throwable error, Class<?> classFile)
logger.log(Level.ERROR, msg.toString());

if (classFile != null) {
msg = new StringBuilder(mod);
msg.append(" API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain()
.getCodeSource().getLocation());
msg.append("API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation());
logger.log(Level.ERROR, msg.toString());
}
}

@Deprecated
public static String getVersion() {
try {
Class<?> clazz = Class.forName("buildcraft.core.Version");
Method method = clazz.getDeclaredMethod("getVersion");
return String.valueOf(method.invoke(null));
} catch (Exception e) {
return "UNKNOWN VERSION";
}
return BuildCraftAPI.getVersion();
}
}
11 changes: 11 additions & 0 deletions api/buildcraft/api/core/BuildCraftAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* should be located as "LICENSE.API" in the BuildCraft source code distribution. */
package buildcraft.api.core;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Set;

Expand All @@ -24,6 +25,16 @@ public final class BuildCraftAPI {
/** Deactivate constructor */
private BuildCraftAPI() {}

public static String getVersion() {
try {
Class<?> clazz = Class.forName("buildcraft.core.Version");
Method method = clazz.getDeclaredMethod("getVersion");
return String.valueOf(method.invoke(null));
} catch (Exception e) {
return "UNKNOWN VERSION";
}
}

public static IWorldProperty getWorldProperty(String name) {
return worldProperties.get(name);
}
Expand Down
Loading

0 comments on commit 9d0d3d4

Please sign in to comment.