From 00edfac28ca2fae0dadc6a0da92331e5973501fc Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 8 Jan 2014 20:51:43 +0800 Subject: [PATCH] Refactored AL package into RI --- .../entities/EntityMutantAnimal.java | 6 - .../assemblyline/ALRecipeLoader.java | 16 +- .../assemblyline/AssemblyLine.java | 156 +++++++++--------- .../assemblyline/CommonProxy.java | 22 +-- .../assemblyline/IndustryTabs.java | 2 +- .../assemblyline/api/AutoCraftEvent.java | 2 +- .../assemblyline/api/IArmbot.java | 5 +- .../assemblyline/api/IArmbotUseable.java | 4 +- .../assemblyline/api/IBelt.java | 2 +- .../assemblyline/api/IFilterable.java | 2 +- .../assemblyline/api/IManipulator.java | 2 +- .../assemblyline/api/MachineMiningEvent.java | 2 +- .../assemblyline/api/coding/IDataItem.java | 2 +- .../assemblyline/api/coding/ILogicTask.java | 2 +- .../assemblyline/api/coding/IMemorySlot.java | 2 +- .../assemblyline/api/coding/IProcessTask.java | 2 +- .../assemblyline/api/coding/IProgram.java | 2 +- .../assemblyline/api/coding/IProgramItem.java | 2 +- .../api/coding/IProgrammableMachine.java | 2 +- .../api/coding/IRedirectTask.java | 2 +- .../assemblyline/api/coding/ITask.java | 4 +- .../api/coding/ProgramHelper.java | 5 +- .../assemblyline/api/coding/TaskRegistry.java | 4 +- .../api/coding/args/ArgumentData.java | 2 +- .../api/coding/args/ArgumentDoubleData.java | 2 +- .../api/coding/args/ArgumentEntityList.java | 2 +- .../api/coding/args/ArgumentFloatData.java | 2 +- .../api/coding/args/ArgumentIntData.java | 2 +- .../api/coding/args/ArgumentListData.java | 2 +- .../api/fluid/FluidMasterList.java | 2 +- .../api/fluid/FluidMixingEvent.java | 2 +- .../assemblyline/api/fluid/IDrain.java | 2 +- .../api/fluid/INetworkFluidPart.java | 2 +- .../assemblyline/api/fluid/INetworkPipe.java | 2 +- .../assemblyline/armbot/BlockArmbot.java | 10 +- .../assemblyline/armbot/Program.java | 12 +- .../assemblyline/armbot/TaskBase.java | 10 +- .../assemblyline/armbot/TaskBaseArmbot.java | 6 +- .../assemblyline/armbot/TaskBaseLogic.java | 4 +- .../assemblyline/armbot/TaskBaseProcess.java | 4 +- .../assemblyline/armbot/TileEntityArmbot.java | 26 +-- .../armbot/command/TaskBreak.java | 10 +- .../assemblyline/armbot/command/TaskDrop.java | 9 +- .../assemblyline/armbot/command/TaskEnd.java | 4 +- .../assemblyline/armbot/command/TaskFire.java | 10 +- .../assemblyline/armbot/command/TaskGOTO.java | 9 +- .../assemblyline/armbot/command/TaskGive.java | 12 +- .../armbot/command/TaskGrabEntity.java | 8 +- .../armbot/command/TaskGrabItem.java | 8 +- .../armbot/command/TaskGrabPrefab.java | 9 +- .../armbot/command/TaskHarvest.java | 2 +- .../assemblyline/armbot/command/TaskIF.java | 11 +- .../assemblyline/armbot/command/TaskIdle.java | 8 +- .../armbot/command/TaskPlace.java | 9 +- .../armbot/command/TaskReturn.java | 4 +- .../armbot/command/TaskRotateBy.java | 10 +- .../armbot/command/TaskRotateTo.java | 10 +- .../armbot/command/TaskStart.java | 4 +- .../assemblyline/armbot/command/TaskTake.java | 10 +- .../assemblyline/armbot/command/TaskUse.java | 14 +- .../assemblyline/blocks/BlockAssembly.java | 8 +- .../assemblyline/blocks/BlockBasalt.java | 4 +- .../assemblyline/blocks/BlockColorGlass.java | 4 +- .../blocks/BlockColorGlowGlass.java | 2 +- .../assemblyline/blocks/BlockColorSand.java | 4 +- .../assemblyline/blocks/BlockColored.java | 4 +- .../assemblyline/blocks/BlockGasOre.java | 8 +- .../assemblyline/blocks/BlockHydraulic.java | 6 +- .../assemblyline/blocks/BlockOre.java | 6 +- .../assemblyline/blocks/GasOreGenerator.java | 6 +- .../assemblyline/blocks/ItemBlockBasalt.java | 2 +- .../assemblyline/blocks/ItemBlockColored.java | 2 +- .../assemblyline/client/ClientProxy.java | 72 ++++---- .../assemblyline/client/SoundHandler.java | 6 +- .../assemblyline/client/gui/EnumTaskIcon.java | 2 +- .../client/gui/GuiBatteryBox.java | 10 +- .../assemblyline/client/gui/GuiEditTask.java | 8 +- .../client/gui/GuiEncoderBase.java | 6 +- .../client/gui/GuiEncoderCoder.java | 5 +- .../client/gui/GuiEncoderHelp.java | 7 +- .../client/gui/GuiEncoderInventory.java | 9 +- .../assemblyline/client/gui/GuiImprinter.java | 9 +- .../assemblyline/client/gui/GuiProcessor.java | 9 +- .../assemblyline/client/gui/GuiTask.java | 9 +- .../assemblyline/client/gui/GuiTaskList.java | 17 +- .../client/model/ModelAdvancedHopper.java | 2 +- .../client/model/ModelAngledBelt.java | 2 +- .../client/model/ModelArmbot.java | 2 +- .../client/model/ModelCenterTank.java | 2 +- .../client/model/ModelConstructionPump.java | 2 +- .../client/model/ModelConveyorBelt.java | 2 +- .../client/model/ModelCopperWire.java | 2 +- .../client/model/ModelCornerTank.java | 2 +- .../client/model/ModelCrusher.java | 2 +- .../client/model/ModelElecFurnace.java | 2 +- .../client/model/ModelEngine.java | 2 +- .../client/model/ModelFrackingPipe.java | 2 +- .../client/model/ModelFurnace.java | 2 +- .../client/model/ModelGearPiston.java | 2 +- .../client/model/ModelGearRod.java | 2 +- .../client/model/ModelGenerator.java | 2 +- .../client/model/ModelGrinder.java | 2 +- .../client/model/ModelHelper.java | 2 +- .../client/model/ModelLargePipe.java | 2 +- .../client/model/ModelLaserTile.java | 2 +- .../client/model/ModelLiquidTankCorner.java | 2 +- .../client/model/ModelMachine.java | 2 +- .../client/model/ModelManipulator.java | 2 +- .../client/model/ModelMiningLaserGun.java | 2 +- .../client/model/ModelOpenTrough.java | 2 +- .../assemblyline/client/model/ModelPump.java | 2 +- .../client/model/ModelRejectorPiston.java | 2 +- .../client/model/ModelReleaseValve.java | 2 +- .../assemblyline/client/model/ModelSink.java | 2 +- .../client/model/ModelSmallFluidCan.java | 2 +- .../client/model/ModelSolarPanel.java | 2 +- .../client/model/ModelSteamGen.java | 2 +- .../client/model/ModelSteamTurbine.java | 2 +- .../assemblyline/client/model/ModelTank.java | 2 +- .../client/model/ModelTankSide.java | 2 +- .../client/model/ModelTestCar.java | 2 +- .../client/model/ModelTurkey.java | 2 +- .../client/render/BlockRenderHelper.java | 17 +- .../client/render/BlockRenderInfo.java | 2 +- .../client/render/BlockRenderingHandler.java | 23 ++- .../client/render/EntityFakeBlock.java | 2 +- .../client/render/ItemPipeRenderer.java | 11 +- .../client/render/ItemRenderFluidCan.java | 11 +- .../client/render/ItemTankRenderer.java | 11 +- .../client/render/RenderAdvancedHopper.java | 9 +- .../client/render/RenderArmbot.java | 10 +- .../client/render/RenderBlockEntity.java | 2 +- .../client/render/RenderBlockSolarPanel.java | 7 +- .../client/render/RenderBlockWire.java | 9 +- .../client/render/RenderConstructionPump.java | 9 +- .../client/render/RenderConveyorBelt.java | 13 +- .../client/render/RenderCrate.java | 6 +- .../client/render/RenderDetector.java | 14 +- .../client/render/RenderFluidHelper.java | 2 +- .../client/render/RenderFrackingPipe.java | 6 +- .../client/render/RenderFurnace.java | 7 +- .../client/render/RenderGearPiston.java | 7 +- .../client/render/RenderGearRod.java | 5 +- .../client/render/RenderGenerator.java | 5 +- .../client/render/RenderHelper.java | 2 +- .../client/render/RenderImprintable.java | 8 +- .../client/render/RenderManipulator.java | 9 +- .../client/render/RenderMiningLaser.java | 8 +- .../client/render/RenderMiningLaserGun.java | 7 +- .../client/render/RenderPipe.java | 15 +- .../client/render/RenderProcessor.java | 11 +- .../client/render/RenderPump.java | 9 +- .../client/render/RenderRejector.java | 9 +- .../client/render/RenderReleaseValve.java | 11 +- .../client/render/RenderSink.java | 7 +- .../client/render/RenderSteamGen.java | 11 +- .../client/render/RenderTank.java | 7 +- .../client/render/RenderTestCar.java | 9 +- .../client/render/RenderTurkey.java | 10 +- .../crafting/BlockCraftingTable.java | 4 +- .../crafting/TileEntityCraftingTable.java | 2 +- .../assemblyline/entities/EntityFarmEgg.java | 2 +- .../entities/EntityMutantAnimal.java | 6 + .../assemblyline/entities/EntityTurkey.java | 2 +- .../assemblyline/entities/EnumBird.java | 6 +- .../entities/prefab/EntityAdvanced.java | 2 +- .../entities/prefab/EntityTestCar.java | 5 +- .../entities/prefab/EntityVehicle.java | 4 +- .../entities/prefab/ItemVehicleSpawn.java | 4 +- .../assemblyline/fluid/EnumFluid.java | 2 +- .../assemblyline/fluid/EnumGas.java | 2 +- .../assemblyline/fluid/FilteredTank.java | 2 +- .../fluid/FluidCraftingHandler.java | 6 +- .../assemblyline/fluid/Gas.java | 2 +- .../assemblyline/fluid/GasTank.java | 2 +- .../assemblyline/fluid/LiquidTank.java | 2 +- .../fluid/network/FluidPressurePack.java | 2 +- .../fluid/network/FluidRecipeInfo.java | 2 +- .../fluid/network/IFluidRecipeCrafter.java | 2 +- .../fluid/network/NetworkFluidContainers.java | 4 +- .../fluid/network/NetworkFluidTiles.java | 6 +- .../fluid/network/NetworkPipes.java | 4 +- .../assemblyline/fluid/pipes/BlockPipe.java | 4 +- .../fluid/pipes/EnumPipeType.java | 2 +- .../fluid/pipes/EnumTankTypes.java | 2 +- .../fluid/pipes/FluidPartsMaterial.java | 6 +- .../assemblyline/fluid/pipes/IPipeType.java | 2 +- .../fluid/pipes/ItemBlockPipe.java | 9 +- .../fluid/pipes/TileEntityPipe.java | 8 +- .../fluid/prefab/TileEntityFluidDevice.java | 2 +- .../prefab/TileEntityFluidNetworkTile.java | 14 +- .../fluid/prefab/TileEntityFluidStorage.java | 2 +- .../fluid/pump/BlockConstructionPump.java | 10 +- .../assemblyline/fluid/pump/BlockDrain.java | 6 +- .../fluid/pump/BlockPumpMachine.java | 8 +- .../fluid/pump/LiquidPathFinder.java | 2 +- .../pump/TileEntityConstructionPump.java | 8 +- .../fluid/pump/TileEntityDrain.java | 6 +- .../fluid/pump/TileEntityStarterPump.java | 4 +- .../generators/BlockSmallSteamGen.java | 10 +- .../generators/BlockSolarPanel.java | 10 +- .../generators/ContainerCoalGenerator.java | 2 +- .../generators/TileEntitySolarBox.java | 4 +- .../generators/TileEntitySolarPanel.java | 5 +- .../generators/TileEntitySteamFan.java | 2 +- .../generators/TileEntitySteamGen.java | 2 +- .../generators/TileEntitySteamPiston.java | 2 +- .../imprinter/BlockImprinter.java | 8 +- .../imprinter/ContainerImprinter.java | 2 +- .../assemblyline/imprinter/ItemImprinter.java | 8 +- .../imprinter/TileEntityImprinter.java | 10 +- .../imprinter/prefab/BlockImprintable.java | 9 +- .../prefab/TileEntityFilterable.java | 8 +- .../item/BehaviorDispenseEgg.java | 5 +- .../assemblyline/item/EnumTool.java | 4 +- .../assemblyline/item/ItemBattery.java | 6 +- .../assemblyline/item/ItemBlockOre.java | 7 +- .../assemblyline/item/ItemColoredDust.java | 4 +- .../assemblyline/item/ItemCommonTool.java | 4 +- .../assemblyline/item/ItemFarmBucket.java | 6 +- .../assemblyline/item/ItemFarmEgg.java | 5 +- .../assemblyline/item/ItemFarmFood.java | 4 +- .../assemblyline/item/ItemInstaHole.java | 2 +- .../assemblyline/item/ItemMiningLaser.java | 4 +- .../assemblyline/item/ItemOreDirv.java | 4 +- .../assemblyline/item/ItemParts.java | 4 +- .../assemblyline/item/ItemReadoutTools.java | 6 +- .../assemblyline/item/ItemWrench.java | 4 +- .../machine/BlockApertureExcavator.java | 4 +- .../assemblyline/machine/BlockCrate.java | 8 +- .../assemblyline/machine/BlockDebug.java | 6 +- .../assemblyline/machine/BlockDetector.java | 8 +- .../machine/BlockEnergyStorage.java | 8 +- .../assemblyline/machine/BlockFracker.java | 4 +- .../machine/BlockFrackingPipe.java | 6 +- .../assemblyline/machine/BlockLaserDrill.java | 4 +- .../machine/BlockManipulator.java | 8 +- .../assemblyline/machine/BlockMapUtil.java | 2 +- .../machine/BlockMechanicalGenerator.java | 8 +- .../machine/BlockMiningLaser.java | 6 +- .../assemblyline/machine/BlockRejector.java | 10 +- .../machine/BlockReleaseValve.java | 6 +- .../assemblyline/machine/BlockRod.java | 8 +- .../assemblyline/machine/BlockScanner.java | 4 +- .../assemblyline/machine/BlockSink.java | 6 +- .../machine/BlockSteamPiston.java | 4 +- .../assemblyline/machine/BlockTank.java | 12 +- .../machine/BlockTransformer.java | 6 +- .../assemblyline/machine/BlockTurntable.java | 6 +- .../machine/ContainerBatteryBox.java | 2 +- .../assemblyline/machine/ContainerFilter.java | 5 +- .../machine/ContainerScanner.java | 2 +- .../assemblyline/machine/InventoryCrate.java | 2 +- .../assemblyline/machine/ItemBlockCrate.java | 2 +- .../machine/ItemBlockEnergyStorage.java | 5 +- .../assemblyline/machine/ItemFluidCan.java | 6 +- .../assemblyline/machine/ItemStorageCan.java | 2 +- .../assemblyline/machine/NetworkAssembly.java | 2 +- .../assemblyline/machine/PathfinderCrate.java | 2 +- .../machine/TileApertureExcavator.java | 4 +- .../machine/TileEntityAssembly.java | 2 +- .../machine/TileEntityBatteryBox.java | 2 +- .../assemblyline/machine/TileEntityCrate.java | 6 +- .../machine/TileEntityDetector.java | 6 +- .../machine/TileEntityGenerator.java | 2 +- .../machine/TileEntityInfFluid.java | 2 +- .../machine/TileEntityInfLoad.java | 2 +- .../machine/TileEntityInfSupply.java | 2 +- .../machine/TileEntityManipulator.java | 8 +- .../machine/TileEntityRejector.java | 6 +- .../machine/TileEntityReleaseValve.java | 8 +- .../assemblyline/machine/TileEntitySink.java | 8 +- .../machine/TileEntitySteamPiston.java | 2 +- .../assemblyline/machine/TileEntityTank.java | 8 +- .../assemblyline/machine/TileEntityVoid.java | 2 +- .../assemblyline/machine/TileFracker.java | 8 +- .../machine/TileFrackingPipe.java | 2 +- .../assemblyline/machine/TileGasBurner.java | 4 +- .../machine/TileGasCombustionEngine.java | 6 +- .../assemblyline/machine/TileLaserDrill.java | 2 +- .../assemblyline/machine/TileLaserSentry.java | 2 +- .../assemblyline/machine/TileScanner.java | 2 +- .../machine/belt/BlockConveyorBelt.java | 10 +- .../machine/belt/TileEntityConveyorBelt.java | 8 +- .../machine/encoder/BlockEncoder.java | 8 +- .../machine/encoder/ContainerEncoder.java | 2 +- .../machine/encoder/IInventoryWatcher.java | 2 +- .../machine/encoder/ItemDisk.java | 8 +- .../machine/encoder/SlotDisk.java | 5 +- .../machine/encoder/SlotDiskResult.java | 2 +- .../machine/encoder/TileEntityEncoder.java | 14 +- .../machine/processor/BlockProcessor.java | 12 +- .../machine/processor/ContainerProcessor.java | 2 +- .../processor/TileEntityProcessor.java | 4 +- .../network/ISimplePacketReceiver.java | 2 +- .../assemblyline/network/PacketIDTile.java | 2 +- .../redstone/BlockAdvancedHopper.java | 8 +- .../redstone/BlockPistonPlus.java | 4 +- .../redstone/TileEntityAdvancedHopper.java | 6 +- .../redstone/TileEntityPistonPlus.java | 2 +- .../assemblyline/transmit/BlockWire.java | 10 +- .../assemblyline/transmit/ItemBlockWire.java | 4 +- .../transmit/TileEntityDetectorWire.java | 2 +- .../transmit/TileEntitySwitchWire.java | 2 +- .../assemblyline/transmit/TileEntityWire.java | 6 +- 305 files changed, 884 insertions(+), 947 deletions(-) delete mode 100644 src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/ALRecipeLoader.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/AssemblyLine.java (78%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/CommonProxy.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/IndustryTabs.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/AutoCraftEvent.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/IArmbot.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/IArmbotUseable.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/IBelt.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/IFilterable.java (84%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/IManipulator.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/MachineMiningEvent.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IDataItem.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/ILogicTask.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IMemorySlot.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IProcessTask.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IProgram.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IProgramItem.java (84%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IProgrammableMachine.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/IRedirectTask.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/ITask.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/ProgramHelper.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/TaskRegistry.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentData.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentDoubleData.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentEntityList.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentFloatData.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentIntData.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/coding/args/ArgumentListData.java (88%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/fluid/FluidMasterList.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/fluid/FluidMixingEvent.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/fluid/IDrain.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/fluid/INetworkFluidPart.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/api/fluid/INetworkPipe.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/BlockArmbot.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/Program.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/TaskBase.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/TaskBaseArmbot.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/TaskBaseLogic.java (64%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/TaskBaseProcess.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/TileEntityArmbot.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskBreak.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskDrop.java (69%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskEnd.java (67%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskFire.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskGOTO.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskGive.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskGrabEntity.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskGrabItem.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskGrabPrefab.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskHarvest.java (85%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskIF.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskIdle.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskPlace.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskReturn.java (64%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskRotateBy.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskRotateTo.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskStart.java (78%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskTake.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/armbot/command/TaskUse.java (88%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockAssembly.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockBasalt.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockColorGlass.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockColorGlowGlass.java (81%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockColorSand.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockColored.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockGasOre.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockHydraulic.java (70%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/BlockOre.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/GasOreGenerator.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/ItemBlockBasalt.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/blocks/ItemBlockColored.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/ClientProxy.java (63%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/SoundHandler.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/EnumTaskIcon.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiBatteryBox.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiEditTask.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiEncoderBase.java (85%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiEncoderCoder.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiEncoderHelp.java (71%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiEncoderInventory.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiImprinter.java (88%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiProcessor.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiTask.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/gui/GuiTaskList.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelAdvancedHopper.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelAngledBelt.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelArmbot.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelCenterTank.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelConstructionPump.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelConveyorBelt.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelCopperWire.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelCornerTank.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelCrusher.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelElecFurnace.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelEngine.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelFrackingPipe.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelFurnace.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelGearPiston.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelGearRod.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelGenerator.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelGrinder.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelHelper.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelLargePipe.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelLaserTile.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelLiquidTankCorner.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelMachine.java (73%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelManipulator.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelMiningLaserGun.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelOpenTrough.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelPump.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelRejectorPiston.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelReleaseValve.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelSink.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelSmallFluidCan.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelSolarPanel.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelSteamGen.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelSteamTurbine.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelTank.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelTankSide.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelTestCar.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/model/ModelTurkey.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/BlockRenderHelper.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/BlockRenderInfo.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/BlockRenderingHandler.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/EntityFakeBlock.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/ItemPipeRenderer.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/ItemRenderFluidCan.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/ItemTankRenderer.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderAdvancedHopper.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderArmbot.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderBlockEntity.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderBlockSolarPanel.java (84%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderBlockWire.java (85%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderConstructionPump.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderConveyorBelt.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderCrate.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderDetector.java (77%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderFluidHelper.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderFrackingPipe.java (83%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderFurnace.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderGearPiston.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderGearRod.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderGenerator.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderHelper.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderImprintable.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderManipulator.java (88%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderMiningLaser.java (81%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderMiningLaserGun.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderPipe.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderProcessor.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderPump.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderRejector.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderReleaseValve.java (84%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderSink.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderSteamGen.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderTank.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderTestCar.java (88%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/client/render/RenderTurkey.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/crafting/BlockCraftingTable.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/crafting/TileEntityCraftingTable.java (71%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/EntityFarmEgg.java (97%) create mode 100644 src/main/java/resonantinduction/assemblyline/entities/EntityMutantAnimal.java rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/EntityTurkey.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/EnumBird.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/prefab/EntityAdvanced.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/prefab/EntityTestCar.java (82%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/prefab/EntityVehicle.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/entities/prefab/ItemVehicleSpawn.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/EnumFluid.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/EnumGas.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/FilteredTank.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/FluidCraftingHandler.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/Gas.java (87%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/GasTank.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/LiquidTank.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/FluidPressurePack.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/FluidRecipeInfo.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/IFluidRecipeCrafter.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/NetworkFluidContainers.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/NetworkFluidTiles.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/network/NetworkPipes.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/BlockPipe.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/EnumPipeType.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/EnumTankTypes.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/FluidPartsMaterial.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/IPipeType.java (74%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/ItemBlockPipe.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pipes/TileEntityPipe.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/prefab/TileEntityFluidDevice.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/prefab/TileEntityFluidStorage.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/BlockConstructionPump.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/BlockDrain.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/BlockPumpMachine.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/LiquidPathFinder.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/TileEntityConstructionPump.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/TileEntityDrain.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/fluid/pump/TileEntityStarterPump.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/BlockSmallSteamGen.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/BlockSolarPanel.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/ContainerCoalGenerator.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/TileEntitySolarBox.java (75%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/TileEntitySolarPanel.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/TileEntitySteamFan.java (71%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/TileEntitySteamGen.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/generators/TileEntitySteamPiston.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/BlockImprinter.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/ContainerImprinter.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/ItemImprinter.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/TileEntityImprinter.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/prefab/BlockImprintable.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/imprinter/prefab/TileEntityFilterable.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/BehaviorDispenseEgg.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/EnumTool.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemBattery.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemBlockOre.java (81%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemColoredDust.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemCommonTool.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemFarmBucket.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemFarmEgg.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemFarmFood.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemInstaHole.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemMiningLaser.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemOreDirv.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemParts.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemReadoutTools.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/item/ItemWrench.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockApertureExcavator.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockCrate.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockDebug.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockDetector.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockEnergyStorage.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockFracker.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockFrackingPipe.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockLaserDrill.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockManipulator.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockMapUtil.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockMechanicalGenerator.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockMiningLaser.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockRejector.java (86%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockReleaseValve.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockRod.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockScanner.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockSink.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockSteamPiston.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockTank.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockTransformer.java (76%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/BlockTurntable.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ContainerBatteryBox.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ContainerFilter.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ContainerScanner.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/InventoryCrate.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ItemBlockCrate.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ItemBlockEnergyStorage.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ItemFluidCan.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/ItemStorageCan.java (74%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/NetworkAssembly.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/PathfinderCrate.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileApertureExcavator.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityAssembly.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityBatteryBox.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityCrate.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityDetector.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityGenerator.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityInfFluid.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityInfLoad.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityInfSupply.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityManipulator.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityRejector.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityReleaseValve.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntitySink.java (92%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntitySteamPiston.java (74%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityTank.java (84%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileEntityVoid.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileFracker.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileFrackingPipe.java (72%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileGasBurner.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileGasCombustionEngine.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileLaserDrill.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileLaserSentry.java (99%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/TileScanner.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/belt/BlockConveyorBelt.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/belt/TileEntityConveyorBelt.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/BlockEncoder.java (91%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/ContainerEncoder.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/IInventoryWatcher.java (57%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/ItemDisk.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/SlotDisk.java (80%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/SlotDiskResult.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/encoder/TileEntityEncoder.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/processor/BlockProcessor.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/processor/ContainerProcessor.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/machine/processor/TileEntityProcessor.java (98%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/network/ISimplePacketReceiver.java (93%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/network/PacketIDTile.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/redstone/BlockAdvancedHopper.java (95%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/redstone/BlockPistonPlus.java (79%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/redstone/TileEntityAdvancedHopper.java (96%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/redstone/TileEntityPistonPlus.java (90%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/transmit/BlockWire.java (97%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/transmit/ItemBlockWire.java (81%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/transmit/TileEntityDetectorWire.java (89%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/transmit/TileEntitySwitchWire.java (94%) rename src/main/java/{com/builtbroken => resonantinduction}/assemblyline/transmit/TileEntityWire.java (97%) diff --git a/src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java b/src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java deleted file mode 100644 index 7769fe4f6..000000000 --- a/src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.builtbroken.assemblyline.entities; - -public class EntityMutantAnimal -{ - -} diff --git a/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/main/java/resonantinduction/assemblyline/ALRecipeLoader.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java rename to src/main/java/resonantinduction/assemblyline/ALRecipeLoader.java index e5f1f004f..57e2adf66 100644 --- a/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java +++ b/src/main/java/resonantinduction/assemblyline/ALRecipeLoader.java @@ -1,7 +1,14 @@ -package com.builtbroken.assemblyline; +package resonantinduction.assemblyline; import java.util.List; +import resonantinduction.assemblyline.blocks.BlockBasalt; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; +import resonantinduction.assemblyline.item.EnumTool; +import resonantinduction.assemblyline.item.ItemOreDirv; +import resonantinduction.assemblyline.item.ItemParts.Parts; +import resonantinduction.assemblyline.machine.BlockCrate; +import resonantinduction.assemblyline.machine.processor.BlockProcessor; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -11,13 +18,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import com.builtbroken.assemblyline.blocks.BlockBasalt; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; -import com.builtbroken.assemblyline.item.EnumTool; -import com.builtbroken.assemblyline.item.ItemOreDirv; -import com.builtbroken.assemblyline.item.ItemParts.Parts; -import com.builtbroken.assemblyline.machine.BlockCrate; -import com.builtbroken.assemblyline.machine.processor.BlockProcessor; import com.builtbroken.minecraft.EnumMaterial; import com.builtbroken.minecraft.EnumOrePart; import com.builtbroken.minecraft.helpers.ColorCode; diff --git a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java b/src/main/java/resonantinduction/assemblyline/AssemblyLine.java similarity index 78% rename from src/main/java/com/builtbroken/assemblyline/AssemblyLine.java rename to src/main/java/resonantinduction/assemblyline/AssemblyLine.java index 10fe1a399..300e21684 100644 --- a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java +++ b/src/main/java/resonantinduction/assemblyline/AssemblyLine.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline; +package resonantinduction.assemblyline; import java.io.File; import java.util.Arrays; @@ -16,87 +16,87 @@ import net.minecraftforge.oredict.OreDictionary; import org.modstats.ModstatInfo; import org.modstats.Modstats; +import resonantinduction.assemblyline.api.coding.TaskRegistry; +import resonantinduction.assemblyline.armbot.BlockArmbot; +import resonantinduction.assemblyline.armbot.command.TaskBreak; +import resonantinduction.assemblyline.armbot.command.TaskDrop; +import resonantinduction.assemblyline.armbot.command.TaskEnd; +import resonantinduction.assemblyline.armbot.command.TaskFire; +import resonantinduction.assemblyline.armbot.command.TaskGOTO; +import resonantinduction.assemblyline.armbot.command.TaskGive; +import resonantinduction.assemblyline.armbot.command.TaskGrabEntity; +import resonantinduction.assemblyline.armbot.command.TaskGrabItem; +import resonantinduction.assemblyline.armbot.command.TaskHarvest; +import resonantinduction.assemblyline.armbot.command.TaskIF; +import resonantinduction.assemblyline.armbot.command.TaskIdle; +import resonantinduction.assemblyline.armbot.command.TaskPlace; +import resonantinduction.assemblyline.armbot.command.TaskReturn; +import resonantinduction.assemblyline.armbot.command.TaskRotateBy; +import resonantinduction.assemblyline.armbot.command.TaskRotateTo; +import resonantinduction.assemblyline.armbot.command.TaskStart; +import resonantinduction.assemblyline.armbot.command.TaskTake; +import resonantinduction.assemblyline.armbot.command.TaskUse; +import resonantinduction.assemblyline.blocks.BlockBasalt; +import resonantinduction.assemblyline.blocks.BlockColorGlass; +import resonantinduction.assemblyline.blocks.BlockColorGlowGlass; +import resonantinduction.assemblyline.blocks.BlockColorSand; +import resonantinduction.assemblyline.blocks.BlockGasOre; +import resonantinduction.assemblyline.blocks.BlockOre; +import resonantinduction.assemblyline.blocks.GasOreGenerator; +import resonantinduction.assemblyline.blocks.ItemBlockColored; +import resonantinduction.assemblyline.blocks.BlockOre.OreData; +import resonantinduction.assemblyline.entities.EntityFarmEgg; +import resonantinduction.assemblyline.entities.EnumBird; +import resonantinduction.assemblyline.entities.prefab.EntityTestCar; +import resonantinduction.assemblyline.entities.prefab.ItemVehicleSpawn; +import resonantinduction.assemblyline.fluid.EnumGas; +import resonantinduction.assemblyline.fluid.pipes.BlockPipe; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; +import resonantinduction.assemblyline.fluid.pipes.ItemBlockPipe; +import resonantinduction.assemblyline.fluid.pump.BlockConstructionPump; +import resonantinduction.assemblyline.fluid.pump.BlockDrain; +import resonantinduction.assemblyline.fluid.pump.BlockPumpMachine; +import resonantinduction.assemblyline.generators.BlockSmallSteamGen; +import resonantinduction.assemblyline.generators.BlockSolarPanel; +import resonantinduction.assemblyline.imprinter.BlockImprinter; +import resonantinduction.assemblyline.imprinter.ItemImprinter; +import resonantinduction.assemblyline.item.BehaviorDispenseEgg; +import resonantinduction.assemblyline.item.ItemBattery; +import resonantinduction.assemblyline.item.ItemBlockOre; +import resonantinduction.assemblyline.item.ItemColoredDust; +import resonantinduction.assemblyline.item.ItemCommonTool; +import resonantinduction.assemblyline.item.ItemFarmEgg; +import resonantinduction.assemblyline.item.ItemOreDirv; +import resonantinduction.assemblyline.item.ItemParts; +import resonantinduction.assemblyline.item.ItemReadoutTools; +import resonantinduction.assemblyline.item.ItemWrench; +import resonantinduction.assemblyline.item.ItemParts.Parts; +import resonantinduction.assemblyline.machine.BlockCrate; +import resonantinduction.assemblyline.machine.BlockDebug; +import resonantinduction.assemblyline.machine.BlockDetector; +import resonantinduction.assemblyline.machine.BlockEnergyStorage; +import resonantinduction.assemblyline.machine.BlockManipulator; +import resonantinduction.assemblyline.machine.BlockRejector; +import resonantinduction.assemblyline.machine.BlockReleaseValve; +import resonantinduction.assemblyline.machine.BlockSink; +import resonantinduction.assemblyline.machine.BlockTank; +import resonantinduction.assemblyline.machine.BlockTurntable; +import resonantinduction.assemblyline.machine.ItemBlockCrate; +import resonantinduction.assemblyline.machine.ItemBlockEnergyStorage; +import resonantinduction.assemblyline.machine.ItemFluidCan; +import resonantinduction.assemblyline.machine.TileEntityAssembly; +import resonantinduction.assemblyline.machine.belt.BlockConveyorBelt; +import resonantinduction.assemblyline.machine.encoder.BlockEncoder; +import resonantinduction.assemblyline.machine.encoder.ItemDisk; +import resonantinduction.assemblyline.machine.processor.BlockProcessor; +import resonantinduction.assemblyline.network.PacketIDTile; +import resonantinduction.assemblyline.redstone.BlockAdvancedHopper; +import resonantinduction.assemblyline.transmit.BlockWire; +import resonantinduction.assemblyline.transmit.ItemBlockWire; import calclavia.lib.network.PacketHandler; import calclavia.lib.ore.OreGenReplaceStone; import calclavia.lib.ore.OreGenerator; -import com.builtbroken.assemblyline.api.coding.TaskRegistry; -import com.builtbroken.assemblyline.armbot.BlockArmbot; -import com.builtbroken.assemblyline.armbot.command.TaskBreak; -import com.builtbroken.assemblyline.armbot.command.TaskDrop; -import com.builtbroken.assemblyline.armbot.command.TaskEnd; -import com.builtbroken.assemblyline.armbot.command.TaskFire; -import com.builtbroken.assemblyline.armbot.command.TaskGOTO; -import com.builtbroken.assemblyline.armbot.command.TaskGive; -import com.builtbroken.assemblyline.armbot.command.TaskGrabEntity; -import com.builtbroken.assemblyline.armbot.command.TaskGrabItem; -import com.builtbroken.assemblyline.armbot.command.TaskHarvest; -import com.builtbroken.assemblyline.armbot.command.TaskIF; -import com.builtbroken.assemblyline.armbot.command.TaskIdle; -import com.builtbroken.assemblyline.armbot.command.TaskPlace; -import com.builtbroken.assemblyline.armbot.command.TaskReturn; -import com.builtbroken.assemblyline.armbot.command.TaskRotateBy; -import com.builtbroken.assemblyline.armbot.command.TaskRotateTo; -import com.builtbroken.assemblyline.armbot.command.TaskStart; -import com.builtbroken.assemblyline.armbot.command.TaskTake; -import com.builtbroken.assemblyline.armbot.command.TaskUse; -import com.builtbroken.assemblyline.blocks.BlockBasalt; -import com.builtbroken.assemblyline.blocks.BlockColorGlass; -import com.builtbroken.assemblyline.blocks.BlockColorGlowGlass; -import com.builtbroken.assemblyline.blocks.BlockColorSand; -import com.builtbroken.assemblyline.blocks.BlockGasOre; -import com.builtbroken.assemblyline.blocks.BlockOre; -import com.builtbroken.assemblyline.blocks.BlockOre.OreData; -import com.builtbroken.assemblyline.blocks.GasOreGenerator; -import com.builtbroken.assemblyline.blocks.ItemBlockColored; -import com.builtbroken.assemblyline.entities.EntityFarmEgg; -import com.builtbroken.assemblyline.entities.EnumBird; -import com.builtbroken.assemblyline.entities.prefab.EntityTestCar; -import com.builtbroken.assemblyline.entities.prefab.ItemVehicleSpawn; -import com.builtbroken.assemblyline.fluid.EnumGas; -import com.builtbroken.assemblyline.fluid.pipes.BlockPipe; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; -import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe; -import com.builtbroken.assemblyline.fluid.pump.BlockConstructionPump; -import com.builtbroken.assemblyline.fluid.pump.BlockDrain; -import com.builtbroken.assemblyline.fluid.pump.BlockPumpMachine; -import com.builtbroken.assemblyline.generators.BlockSmallSteamGen; -import com.builtbroken.assemblyline.generators.BlockSolarPanel; -import com.builtbroken.assemblyline.imprinter.BlockImprinter; -import com.builtbroken.assemblyline.imprinter.ItemImprinter; -import com.builtbroken.assemblyline.item.BehaviorDispenseEgg; -import com.builtbroken.assemblyline.item.ItemBattery; -import com.builtbroken.assemblyline.item.ItemBlockOre; -import com.builtbroken.assemblyline.item.ItemColoredDust; -import com.builtbroken.assemblyline.item.ItemCommonTool; -import com.builtbroken.assemblyline.item.ItemFarmEgg; -import com.builtbroken.assemblyline.item.ItemOreDirv; -import com.builtbroken.assemblyline.item.ItemParts; -import com.builtbroken.assemblyline.item.ItemParts.Parts; -import com.builtbroken.assemblyline.item.ItemReadoutTools; -import com.builtbroken.assemblyline.item.ItemWrench; -import com.builtbroken.assemblyline.machine.BlockCrate; -import com.builtbroken.assemblyline.machine.BlockDebug; -import com.builtbroken.assemblyline.machine.BlockDetector; -import com.builtbroken.assemblyline.machine.BlockEnergyStorage; -import com.builtbroken.assemblyline.machine.BlockManipulator; -import com.builtbroken.assemblyline.machine.BlockRejector; -import com.builtbroken.assemblyline.machine.BlockReleaseValve; -import com.builtbroken.assemblyline.machine.BlockSink; -import com.builtbroken.assemblyline.machine.BlockTank; -import com.builtbroken.assemblyline.machine.BlockTurntable; -import com.builtbroken.assemblyline.machine.ItemBlockCrate; -import com.builtbroken.assemblyline.machine.ItemBlockEnergyStorage; -import com.builtbroken.assemblyline.machine.ItemFluidCan; -import com.builtbroken.assemblyline.machine.TileEntityAssembly; -import com.builtbroken.assemblyline.machine.belt.BlockConveyorBelt; -import com.builtbroken.assemblyline.machine.encoder.BlockEncoder; -import com.builtbroken.assemblyline.machine.encoder.ItemDisk; -import com.builtbroken.assemblyline.machine.processor.BlockProcessor; -import com.builtbroken.assemblyline.network.PacketIDTile; -import com.builtbroken.assemblyline.redstone.BlockAdvancedHopper; -import com.builtbroken.assemblyline.transmit.BlockWire; -import com.builtbroken.assemblyline.transmit.ItemBlockWire; import com.builtbroken.minecraft.CoreRegistry; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.EnumMaterial; diff --git a/src/main/java/com/builtbroken/assemblyline/CommonProxy.java b/src/main/java/resonantinduction/assemblyline/CommonProxy.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/CommonProxy.java rename to src/main/java/resonantinduction/assemblyline/CommonProxy.java index 77eb13b45..759d789eb 100644 --- a/src/main/java/com/builtbroken/assemblyline/CommonProxy.java +++ b/src/main/java/resonantinduction/assemblyline/CommonProxy.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline; +package resonantinduction.assemblyline; import java.io.File; import java.io.FileInputStream; @@ -6,20 +6,20 @@ import java.io.FileOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import resonantinduction.assemblyline.generators.ContainerCoalGenerator; +import resonantinduction.assemblyline.generators.TileEntitySteamGen; +import resonantinduction.assemblyline.imprinter.ContainerImprinter; +import resonantinduction.assemblyline.imprinter.TileEntityImprinter; +import resonantinduction.assemblyline.machine.ContainerBatteryBox; +import resonantinduction.assemblyline.machine.TileEntityBatteryBox; +import resonantinduction.assemblyline.machine.encoder.ContainerEncoder; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; +import resonantinduction.assemblyline.machine.processor.ContainerProcessor; +import resonantinduction.assemblyline.machine.processor.TileEntityProcessor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.builtbroken.assemblyline.generators.ContainerCoalGenerator; -import com.builtbroken.assemblyline.generators.TileEntitySteamGen; -import com.builtbroken.assemblyline.imprinter.ContainerImprinter; -import com.builtbroken.assemblyline.imprinter.TileEntityImprinter; -import com.builtbroken.assemblyline.machine.ContainerBatteryBox; -import com.builtbroken.assemblyline.machine.TileEntityBatteryBox; -import com.builtbroken.assemblyline.machine.encoder.ContainerEncoder; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; -import com.builtbroken.assemblyline.machine.processor.ContainerProcessor; -import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor; import com.builtbroken.minecraft.prefab.invgui.ContainerFake; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/com/builtbroken/assemblyline/IndustryTabs.java b/src/main/java/resonantinduction/assemblyline/IndustryTabs.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/IndustryTabs.java rename to src/main/java/resonantinduction/assemblyline/IndustryTabs.java index def910540..063ab9b91 100644 --- a/src/main/java/com/builtbroken/assemblyline/IndustryTabs.java +++ b/src/main/java/resonantinduction/assemblyline/IndustryTabs.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline; +package resonantinduction.assemblyline; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/com/builtbroken/assemblyline/api/AutoCraftEvent.java b/src/main/java/resonantinduction/assemblyline/api/AutoCraftEvent.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/AutoCraftEvent.java rename to src/main/java/resonantinduction/assemblyline/api/AutoCraftEvent.java index c4697d09d..7417d51d0 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/AutoCraftEvent.java +++ b/src/main/java/resonantinduction/assemblyline/api/AutoCraftEvent.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/builtbroken/assemblyline/api/IArmbot.java b/src/main/java/resonantinduction/assemblyline/api/IArmbot.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/api/IArmbot.java rename to src/main/java/resonantinduction/assemblyline/api/IArmbot.java index 4012f9e46..9adeee5ac 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/IArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/api/IArmbot.java @@ -1,11 +1,10 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; - /** Should be used to interact with the armbot and not to create a new armbot */ public interface IArmbot extends Cloneable, IProgrammableMachine { diff --git a/src/main/java/com/builtbroken/assemblyline/api/IArmbotUseable.java b/src/main/java/resonantinduction/assemblyline/api/IArmbotUseable.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/api/IArmbotUseable.java rename to src/main/java/resonantinduction/assemblyline/api/IArmbotUseable.java index aae6fc059..463b84e84 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/IArmbotUseable.java +++ b/src/main/java/resonantinduction/assemblyline/api/IArmbotUseable.java @@ -1,8 +1,8 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; import java.util.List; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; /** The IUseable inteface is used by the ArmBot so that it may interact with Tile Entities. onUse * will be called on the block an ArmBot is touching whenever the USE command is run on it. diff --git a/src/main/java/com/builtbroken/assemblyline/api/IBelt.java b/src/main/java/resonantinduction/assemblyline/api/IBelt.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/api/IBelt.java rename to src/main/java/resonantinduction/assemblyline/api/IBelt.java index 4964dcaca..e9b581f9f 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/IBelt.java +++ b/src/main/java/resonantinduction/assemblyline/api/IBelt.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/api/IFilterable.java b/src/main/java/resonantinduction/assemblyline/api/IFilterable.java similarity index 84% rename from src/main/java/com/builtbroken/assemblyline/api/IFilterable.java rename to src/main/java/resonantinduction/assemblyline/api/IFilterable.java index 487569fc9..87695daab 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/IFilterable.java +++ b/src/main/java/resonantinduction/assemblyline/api/IFilterable.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/builtbroken/assemblyline/api/IManipulator.java b/src/main/java/resonantinduction/assemblyline/api/IManipulator.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/api/IManipulator.java rename to src/main/java/resonantinduction/assemblyline/api/IManipulator.java index 3e204d059..74df5d9a3 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/IManipulator.java +++ b/src/main/java/resonantinduction/assemblyline/api/IManipulator.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; /** Interface applied to the manipulator. * diff --git a/src/main/java/com/builtbroken/assemblyline/api/MachineMiningEvent.java b/src/main/java/resonantinduction/assemblyline/api/MachineMiningEvent.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/api/MachineMiningEvent.java rename to src/main/java/resonantinduction/assemblyline/api/MachineMiningEvent.java index 015fcdf6b..2b7a771f2 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/MachineMiningEvent.java +++ b/src/main/java/resonantinduction/assemblyline/api/MachineMiningEvent.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api; +package resonantinduction.assemblyline.api; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IDataItem.java b/src/main/java/resonantinduction/assemblyline/api/coding/IDataItem.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IDataItem.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IDataItem.java index 9271ad7d0..0ba24258d 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IDataItem.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IDataItem.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/ILogicTask.java b/src/main/java/resonantinduction/assemblyline/api/coding/ILogicTask.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/api/coding/ILogicTask.java rename to src/main/java/resonantinduction/assemblyline/api/coding/ILogicTask.java index 3f30bbf52..a89842d3a 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/ILogicTask.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/ILogicTask.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IMemorySlot.java b/src/main/java/resonantinduction/assemblyline/api/coding/IMemorySlot.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IMemorySlot.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IMemorySlot.java index a0343570a..1bb0deb53 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IMemorySlot.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IMemorySlot.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IProcessTask.java b/src/main/java/resonantinduction/assemblyline/api/coding/IProcessTask.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IProcessTask.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IProcessTask.java index 7da7c1de1..9d8d4b16f 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IProcessTask.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IProcessTask.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import dan200.computer.api.IComputerAccess; import dan200.computer.api.ILuaContext; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgram.java b/src/main/java/resonantinduction/assemblyline/api/coding/IProgram.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IProgram.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IProgram.java index 376e92cbe..2acafdd01 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgram.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IProgram.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgramItem.java b/src/main/java/resonantinduction/assemblyline/api/coding/IProgramItem.java similarity index 84% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IProgramItem.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IProgramItem.java index da3cac0c7..c315591a0 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgramItem.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IProgramItem.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; /** IDs that an item can load/save a program * diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java b/src/main/java/resonantinduction/assemblyline/api/coding/IProgrammableMachine.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IProgrammableMachine.java index 3c7266c04..215774bfe 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IProgrammableMachine.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import net.minecraft.world.World; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/IRedirectTask.java b/src/main/java/resonantinduction/assemblyline/api/coding/IRedirectTask.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/api/coding/IRedirectTask.java rename to src/main/java/resonantinduction/assemblyline/api/coding/IRedirectTask.java index 04524a69e..2c051c922 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/IRedirectTask.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/IRedirectTask.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; /** Used to tell the program that this task is used to tell the program were to go next. Used by * things like LOOP, IF, and GOTO statement's end catches. Not actually used by the statement itself diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/ITask.java b/src/main/java/resonantinduction/assemblyline/api/coding/ITask.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/coding/ITask.java rename to src/main/java/resonantinduction/assemblyline/api/coding/ITask.java index cb74ff35a..f19be939d 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/ITask.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/ITask.java @@ -1,12 +1,12 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.List; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.minecraft.save.ISaveObj; /** @author DarkGuardsman */ diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/ProgramHelper.java b/src/main/java/resonantinduction/assemblyline/api/coding/ProgramHelper.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/coding/ProgramHelper.java rename to src/main/java/resonantinduction/assemblyline/api/coding/ProgramHelper.java index d2892ab84..fddac6e27 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/ProgramHelper.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/ProgramHelper.java @@ -1,13 +1,12 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.HashMap; +import resonantinduction.assemblyline.api.coding.IProcessTask.ProcessReturn; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.coding.IProcessTask.ProcessReturn; - /** Basic class to handle a machine like programs for any object that uses the IProgramable * interface. Doesn't actually do much then tell the program to function, and stores the programs * active run time memory. diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/TaskRegistry.java b/src/main/java/resonantinduction/assemblyline/api/coding/TaskRegistry.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/coding/TaskRegistry.java rename to src/main/java/resonantinduction/assemblyline/api/coding/TaskRegistry.java index e5df9238d..0f2a37c8d 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/TaskRegistry.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/TaskRegistry.java @@ -1,11 +1,11 @@ -package com.builtbroken.assemblyline.api.coding; +package resonantinduction.assemblyline.api.coding; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import com.builtbroken.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.IArmbot; /** Used to both register task and fake machines for the encoder to use to create new programs. * diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentData.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentData.java index e45f162ce..fa54dcec5 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentData.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentDoubleData.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentDoubleData.java index 2b33f9e20..2f534a9f9 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentDoubleData.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; import net.minecraft.util.MathHelper; import universalelectricity.api.energy.UnitDisplay; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentEntityList.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentEntityList.java index 6f9336100..8bcd784f4 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentEntityList.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentFloatData.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentFloatData.java index 968f48fdb..b4fb12088 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentFloatData.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; import net.minecraft.util.MathHelper; import universalelectricity.api.energy.UnitDisplay; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentIntData.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentIntData.java index c7cde3757..29d23c795 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentIntData.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentListData.java similarity index 88% rename from src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java rename to src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentListData.java index fd6cc863e..3b3f0d162 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java +++ b/src/main/java/resonantinduction/assemblyline/api/coding/args/ArgumentListData.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.coding.args; +package resonantinduction.assemblyline.api.coding.args; /** Used to store lists of data that the user can scroll threw to select one. * diff --git a/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java b/src/main/java/resonantinduction/assemblyline/api/fluid/FluidMasterList.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java rename to src/main/java/resonantinduction/assemblyline/api/fluid/FluidMasterList.java index a7c5a1cb8..a5682bfa7 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java +++ b/src/main/java/resonantinduction/assemblyline/api/fluid/FluidMasterList.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.fluid; +package resonantinduction.assemblyline.api.fluid; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java b/src/main/java/resonantinduction/assemblyline/api/fluid/FluidMixingEvent.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java rename to src/main/java/resonantinduction/assemblyline/api/fluid/FluidMixingEvent.java index c74ba4d31..f37fb19da 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java +++ b/src/main/java/resonantinduction/assemblyline/api/fluid/FluidMixingEvent.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.fluid; +package resonantinduction.assemblyline.api.fluid; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/com/builtbroken/assemblyline/api/fluid/IDrain.java b/src/main/java/resonantinduction/assemblyline/api/fluid/IDrain.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/fluid/IDrain.java rename to src/main/java/resonantinduction/assemblyline/api/fluid/IDrain.java index 683a3eae4..9abbf238b 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/fluid/IDrain.java +++ b/src/main/java/resonantinduction/assemblyline/api/fluid/IDrain.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.fluid; +package resonantinduction.assemblyline.api.fluid; import java.util.Set; diff --git a/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java b/src/main/java/resonantinduction/assemblyline/api/fluid/INetworkFluidPart.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java rename to src/main/java/resonantinduction/assemblyline/api/fluid/INetworkFluidPart.java index a362d4b50..4576dacae 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java +++ b/src/main/java/resonantinduction/assemblyline/api/fluid/INetworkFluidPart.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.fluid; +package resonantinduction.assemblyline.api.fluid; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java b/src/main/java/resonantinduction/assemblyline/api/fluid/INetworkPipe.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java rename to src/main/java/resonantinduction/assemblyline/api/fluid/INetworkPipe.java index ec147bf1f..f139ffcd3 100644 --- a/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java +++ b/src/main/java/resonantinduction/assemblyline/api/fluid/INetworkPipe.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.api.fluid; +package resonantinduction.assemblyline.api.fluid; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java b/src/main/java/resonantinduction/assemblyline/armbot/BlockArmbot.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java rename to src/main/java/resonantinduction/assemblyline/armbot/BlockArmbot.java index 89b80c9cf..d918e514e 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/BlockArmbot.java @@ -1,9 +1,13 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; import java.util.List; import java.util.Random; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockAssembly; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderArmbot; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,10 +16,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockAssembly; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderArmbot; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.interfaces.IBlockActivated; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/Program.java b/src/main/java/resonantinduction/assemblyline/armbot/Program.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/armbot/Program.java rename to src/main/java/resonantinduction/assemblyline/armbot/Program.java index 020825213..3a555f75f 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/Program.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/Program.java @@ -1,19 +1,19 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; +import resonantinduction.assemblyline.api.coding.ILogicTask; +import resonantinduction.assemblyline.api.coding.IProgram; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.api.coding.TaskRegistry; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.ILogicTask; -import com.builtbroken.assemblyline.api.coding.IProgram; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.api.coding.TaskRegistry; import com.builtbroken.minecraft.save.NBTFileHelper; public class Program implements IProgram diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBase.java b/src/main/java/resonantinduction/assemblyline/armbot/TaskBase.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/armbot/TaskBase.java rename to src/main/java/resonantinduction/assemblyline/armbot/TaskBase.java index e9a5ea739..8eea9aff3 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBase.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/TaskBase.java @@ -1,16 +1,16 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.coding.IProgram; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.IProgram; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.minecraft.save.NBTFileHelper; /** @author DarkGuardsman */ diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseArmbot.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java rename to src/main/java/resonantinduction/assemblyline/armbot/TaskBaseArmbot.java index f2baedda3..5d6493554 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseArmbot.java @@ -1,7 +1,7 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; public abstract class TaskBaseArmbot extends TaskBaseProcess { diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseLogic.java similarity index 64% rename from src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java rename to src/main/java/resonantinduction/assemblyline/armbot/TaskBaseLogic.java index 76f749d8a..77a95825e 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseLogic.java @@ -1,6 +1,6 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; -import com.builtbroken.assemblyline.api.coding.ILogicTask; +import resonantinduction.assemblyline.api.coding.ILogicTask; /** @author DarkGuardsman */ public abstract class TaskBaseLogic extends TaskBase implements ILogicTask diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseProcess.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java rename to src/main/java/resonantinduction/assemblyline/armbot/TaskBaseProcess.java index 633e43bae..23247c063 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/TaskBaseProcess.java @@ -1,8 +1,8 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; +import resonantinduction.assemblyline.api.coding.IProcessTask; import net.minecraft.item.ItemStack; -import com.builtbroken.assemblyline.api.coding.IProcessTask; import com.builtbroken.common.science.units.UnitHelper; import dan200.computer.api.IComputerAccess; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/main/java/resonantinduction/assemblyline/armbot/TileEntityArmbot.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java rename to src/main/java/resonantinduction/assemblyline/armbot/TileEntityArmbot.java index e59953ce6..28e7d73b5 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/TileEntityArmbot.java @@ -1,5 +1,17 @@ -package com.builtbroken.assemblyline.armbot; +package resonantinduction.assemblyline.armbot; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.IProgram; +import resonantinduction.assemblyline.api.coding.ProgramHelper; +import resonantinduction.assemblyline.armbot.command.TaskDrop; +import resonantinduction.assemblyline.armbot.command.TaskGOTO; +import resonantinduction.assemblyline.armbot.command.TaskGrabItem; +import resonantinduction.assemblyline.armbot.command.TaskReturn; +import resonantinduction.assemblyline.armbot.command.TaskRotateTo; +import resonantinduction.assemblyline.machine.TileEntityAssembly; +import resonantinduction.assemblyline.machine.encoder.ItemDisk; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.item.EntityItem; @@ -13,18 +25,6 @@ import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.IProgram; -import com.builtbroken.assemblyline.api.coding.ProgramHelper; -import com.builtbroken.assemblyline.armbot.command.TaskDrop; -import com.builtbroken.assemblyline.armbot.command.TaskGOTO; -import com.builtbroken.assemblyline.armbot.command.TaskGrabItem; -import com.builtbroken.assemblyline.armbot.command.TaskReturn; -import com.builtbroken.assemblyline.armbot.command.TaskRotateTo; -import com.builtbroken.assemblyline.machine.TileEntityAssembly; -import com.builtbroken.assemblyline.machine.encoder.ItemDisk; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.TranslationHelper; import com.builtbroken.minecraft.helpers.HelperMethods; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskBreak.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskBreak.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskBreak.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskBreak.java index 2a847b72f..149c24f82 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskBreak.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskBreak.java @@ -1,7 +1,11 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.ArrayList; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -9,10 +13,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.helpers.HelperMethods; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskDrop.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskDrop.java similarity index 69% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskDrop.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskDrop.java index ac0057aba..cb5380666 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskDrop.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskDrop.java @@ -1,11 +1,10 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; - public class TaskDrop extends TaskBaseArmbot { public TaskDrop() diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskEnd.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskEnd.java similarity index 67% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskEnd.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskEnd.java index 4052d4821..e9e6efc00 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskEnd.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskEnd.java @@ -1,6 +1,6 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; -import com.builtbroken.assemblyline.armbot.TaskBase; +import resonantinduction.assemblyline.armbot.TaskBase; /** @author DarkGuardsman */ public class TaskEnd extends TaskBase diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskFire.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskFire.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskFire.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskFire.java index bfbce3610..b6191e646 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskFire.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskFire.java @@ -1,7 +1,11 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.Random; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentFloatData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.projectile.EntityArrow; @@ -11,10 +15,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentFloatData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.Pair; import com.builtbroken.common.science.units.UnitHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGOTO.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskGOTO.java index 8c4386793..3ab3842b7 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGOTO.java @@ -1,15 +1,14 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.coding.IRedirectTask; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.armbot.TaskBase; import net.minecraft.nbt.NBTTagCompound; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.IRedirectTask; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.armbot.TaskBase; - /** @author DarkGuardsman */ public class TaskGOTO extends TaskBase implements IRedirectTask { diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGive.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGive.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGive.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskGive.java index 99c305d95..1026099fa 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGive.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGive.java @@ -1,8 +1,13 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,11 +16,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; import com.builtbroken.minecraft.helpers.InvInteractionHelper; import com.builtbroken.minecraft.helpers.MathHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabEntity.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabEntity.java index 67a342505..6c921b342 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabEntity.java @@ -1,7 +1,10 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.player.EntityPlayer; @@ -9,9 +12,6 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.minecraft.helpers.EntityDictionary; public class TaskGrabEntity extends TaskGrabPrefab diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabItem.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabItem.java index 579b953e3..5576d1b12 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabItem.java @@ -1,15 +1,15 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; public class TaskGrabItem extends TaskGrabPrefab diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabPrefab.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabPrefab.java index 995cab172..7a8aad440 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskGrabPrefab.java @@ -1,14 +1,13 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.IBelt; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.IBelt; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; - /** Prefab for grab based commands * * @author DarkGuardsman */ diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskHarvest.java similarity index 85% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskHarvest.java index ff3faf30c..43ad84fd2 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskHarvest.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; /** Used by arms to break a specific block in a position. * diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIF.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskIF.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIF.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskIF.java index a205307b3..27110c273 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIF.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskIF.java @@ -1,15 +1,14 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; +import resonantinduction.assemblyline.armbot.TaskBaseLogic; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; -import com.builtbroken.assemblyline.armbot.TaskBaseLogic; - /** @author DarkGuardsman */ public class TaskIF extends TaskBaseLogic { diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIdle.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskIdle.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIdle.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskIdle.java index 13b5f17c0..cbf5fb4ec 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIdle.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskIdle.java @@ -1,12 +1,12 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.coding.IProgrammableMachine; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.nbt.NBTTagCompound; -import com.builtbroken.assemblyline.api.coding.IProgrammableMachine; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; public class TaskIdle extends TaskBaseProcess diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskPlace.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskPlace.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskPlace.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskPlace.java index 557d6820a..0b2ec5c36 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskPlace.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskPlace.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; @@ -8,10 +11,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; - /** Used by arms to break a specific block in a position. * * @author Calclavia */ diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskReturn.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskReturn.java similarity index 64% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskReturn.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskReturn.java index c1fded8b6..03a8f0108 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskReturn.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskReturn.java @@ -1,6 +1,6 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; public class TaskReturn extends TaskRotateTo { diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateBy.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateBy.java index 44b867486..43dfa9693 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateBy.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.nbt.NBTTagCompound; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; import com.builtbroken.minecraft.helpers.MathHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateTo.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateTo.java index 421f13009..c2828c71b 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskRotateTo.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.nbt.NBTTagCompound; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; import com.builtbroken.minecraft.helpers.MathHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskStart.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskStart.java similarity index 78% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskStart.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskStart.java index 311d3e67b..1313ac059 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskStart.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskStart.java @@ -1,6 +1,6 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; -import com.builtbroken.assemblyline.armbot.TaskBase; +import resonantinduction.assemblyline.armbot.TaskBase; /** Fake task as the player can not create, edit, or do anything with this task. Its only used to * allow the gui to render the task as an actual task instance diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskTake.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskTake.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskTake.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskTake.java index 6c0fc65e6..27ffbd869 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskTake.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskTake.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,10 +15,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector2; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; import com.builtbroken.minecraft.helpers.InvInteractionHelper; import com.builtbroken.minecraft.helpers.MathHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskUse.java b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskUse.java similarity index 88% rename from src/main/java/com/builtbroken/assemblyline/armbot/command/TaskUse.java rename to src/main/java/resonantinduction/assemblyline/armbot/command/TaskUse.java index c79dc1da0..0c9545b35 100644 --- a/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskUse.java +++ b/src/main/java/resonantinduction/assemblyline/armbot/command/TaskUse.java @@ -1,17 +1,17 @@ -package com.builtbroken.assemblyline.armbot.command; +package resonantinduction.assemblyline.armbot.command; import java.util.List; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.IArmbotUseable; +import resonantinduction.assemblyline.api.coding.IProcessTask; +import resonantinduction.assemblyline.api.coding.args.ArgumentIntData; +import resonantinduction.assemblyline.armbot.TaskBaseArmbot; +import resonantinduction.assemblyline.armbot.TaskBaseProcess; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.IArmbotUseable; -import com.builtbroken.assemblyline.api.coding.IProcessTask; -import com.builtbroken.assemblyline.api.coding.args.ArgumentIntData; -import com.builtbroken.assemblyline.armbot.TaskBaseArmbot; -import com.builtbroken.assemblyline.armbot.TaskBaseProcess; import com.builtbroken.common.science.units.UnitHelper; public class TaskUse extends TaskBaseArmbot diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockAssembly.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockAssembly.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockAssembly.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockAssembly.java index 636808520..525f219a3 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockAssembly.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockAssembly.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.machine.TileEntityAssembly; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.machine.TileEntityAssembly; import com.builtbroken.minecraft.prefab.BlockMachine; public class BlockAssembly extends BlockMachine diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockBasalt.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockBasalt.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockBasalt.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockBasalt.java index 1e266b03c..18e140ebf 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockBasalt.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockBasalt.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.Icon; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlass.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlass.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlass.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlass.java index 72b83330b..85394e215 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlass.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlass.java @@ -1,11 +1,11 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlowGlass.java similarity index 81% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlowGlass.java index 119c9b9e8..43ecfea14 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorGlowGlass.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; public class BlockColorGlowGlass extends BlockColorGlass { diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorSand.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorSand.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockColorSand.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockColorSand.java index 3a6fffab8..ced25f634 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorSand.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockColorSand.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; //TODO fix instant falling sand diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColored.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockColored.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockColored.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockColored.java index 74b3661d4..3a18c414d 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockColored.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockColored.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -10,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.helpers.ColorCode; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockGasOre.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockGasOre.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockGasOre.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockGasOre.java index a62c8d2d6..9b7786be2 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockGasOre.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockGasOre.java @@ -1,9 +1,12 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.awt.Color; import java.util.List; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.fluid.EnumGas; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -21,9 +24,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.fluid.EnumGas; import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockHydraulic.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockHydraulic.java similarity index 70% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockHydraulic.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockHydraulic.java index b9d8ffd58..f0c352b86 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockHydraulic.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockHydraulic.java @@ -1,9 +1,9 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.block.material.Material; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.minecraft.prefab.BlockMachine; public abstract class BlockHydraulic extends BlockMachine diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/BlockOre.java b/src/main/java/resonantinduction/assemblyline/blocks/BlockOre.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/blocks/BlockOre.java rename to src/main/java/resonantinduction/assemblyline/blocks/BlockOre.java index 2b60e6490..e482f94b7 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/BlockOre.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/BlockOre.java @@ -1,8 +1,10 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -16,8 +18,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import calclavia.lib.ore.OreGenReplaceStone; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.EnumMaterial; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/GasOreGenerator.java b/src/main/java/resonantinduction/assemblyline/blocks/GasOreGenerator.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/blocks/GasOreGenerator.java rename to src/main/java/resonantinduction/assemblyline/blocks/GasOreGenerator.java index 223bb4bc8..d8d701b77 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/GasOreGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/GasOreGenerator.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.Random; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -9,9 +10,6 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderEnd; import net.minecraft.world.gen.ChunkProviderHell; import net.minecraftforge.fluids.FluidStack; - -import com.builtbroken.assemblyline.ALRecipeLoader; - import cpw.mods.fml.common.IWorldGenerator; public class GasOreGenerator implements IWorldGenerator diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java b/src/main/java/resonantinduction/assemblyline/blocks/ItemBlockBasalt.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java rename to src/main/java/resonantinduction/assemblyline/blocks/ItemBlockBasalt.java index 5d431c7f5..64725b8e4 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/ItemBlockBasalt.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockColored.java b/src/main/java/resonantinduction/assemblyline/blocks/ItemBlockColored.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockColored.java rename to src/main/java/resonantinduction/assemblyline/blocks/ItemBlockColored.java index aa1114fe0..674bfb206 100644 --- a/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockColored.java +++ b/src/main/java/resonantinduction/assemblyline/blocks/ItemBlockColored.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.blocks; +package resonantinduction.assemblyline.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/com/builtbroken/assemblyline/client/ClientProxy.java b/src/main/java/resonantinduction/assemblyline/client/ClientProxy.java similarity index 63% rename from src/main/java/com/builtbroken/assemblyline/client/ClientProxy.java rename to src/main/java/resonantinduction/assemblyline/client/ClientProxy.java index ac57d25fb..4290e90a5 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/ClientProxy.java +++ b/src/main/java/resonantinduction/assemblyline/client/ClientProxy.java @@ -1,5 +1,39 @@ -package com.builtbroken.assemblyline.client; +package resonantinduction.assemblyline.client; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.CommonProxy; +import resonantinduction.assemblyline.client.gui.GuiBatteryBox; +import resonantinduction.assemblyline.client.gui.GuiEncoderCoder; +import resonantinduction.assemblyline.client.gui.GuiEncoderHelp; +import resonantinduction.assemblyline.client.gui.GuiEncoderInventory; +import resonantinduction.assemblyline.client.gui.GuiImprinter; +import resonantinduction.assemblyline.client.gui.GuiProcessor; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.ItemPipeRenderer; +import resonantinduction.assemblyline.client.render.ItemRenderFluidCan; +import resonantinduction.assemblyline.client.render.ItemTankRenderer; +import resonantinduction.assemblyline.client.render.RenderConstructionPump; +import resonantinduction.assemblyline.client.render.RenderPipe; +import resonantinduction.assemblyline.client.render.RenderPump; +import resonantinduction.assemblyline.client.render.RenderReleaseValve; +import resonantinduction.assemblyline.client.render.RenderSink; +import resonantinduction.assemblyline.client.render.RenderTank; +import resonantinduction.assemblyline.client.render.RenderTestCar; +import resonantinduction.assemblyline.client.render.RenderTurkey; +import resonantinduction.assemblyline.entities.EntityFarmEgg; +import resonantinduction.assemblyline.entities.EntityTurkey; +import resonantinduction.assemblyline.entities.prefab.EntityTestCar; +import resonantinduction.assemblyline.fluid.pipes.TileEntityPipe; +import resonantinduction.assemblyline.fluid.pump.TileEntityConstructionPump; +import resonantinduction.assemblyline.fluid.pump.TileEntityStarterPump; +import resonantinduction.assemblyline.imprinter.TileEntityImprinter; +import resonantinduction.assemblyline.machine.TileEntityBatteryBox; +import resonantinduction.assemblyline.machine.TileEntityReleaseValve; +import resonantinduction.assemblyline.machine.TileEntitySink; +import resonantinduction.assemblyline.machine.TileEntityTank; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; +import resonantinduction.assemblyline.machine.processor.TileEntityProcessor; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.player.EntityPlayer; @@ -8,42 +42,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; - -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.CommonProxy; -import com.builtbroken.assemblyline.client.gui.GuiBatteryBox; -import com.builtbroken.assemblyline.client.gui.GuiEncoderCoder; -import com.builtbroken.assemblyline.client.gui.GuiEncoderHelp; -import com.builtbroken.assemblyline.client.gui.GuiEncoderInventory; -import com.builtbroken.assemblyline.client.gui.GuiImprinter; -import com.builtbroken.assemblyline.client.gui.GuiProcessor; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.ItemPipeRenderer; -import com.builtbroken.assemblyline.client.render.ItemRenderFluidCan; -import com.builtbroken.assemblyline.client.render.ItemTankRenderer; -import com.builtbroken.assemblyline.client.render.RenderConstructionPump; -import com.builtbroken.assemblyline.client.render.RenderPipe; -import com.builtbroken.assemblyline.client.render.RenderPump; -import com.builtbroken.assemblyline.client.render.RenderReleaseValve; -import com.builtbroken.assemblyline.client.render.RenderSink; -import com.builtbroken.assemblyline.client.render.RenderTank; -import com.builtbroken.assemblyline.client.render.RenderTestCar; -import com.builtbroken.assemblyline.client.render.RenderTurkey; -import com.builtbroken.assemblyline.entities.EntityFarmEgg; -import com.builtbroken.assemblyline.entities.EntityTurkey; -import com.builtbroken.assemblyline.entities.prefab.EntityTestCar; -import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe; -import com.builtbroken.assemblyline.fluid.pump.TileEntityConstructionPump; -import com.builtbroken.assemblyline.fluid.pump.TileEntityStarterPump; -import com.builtbroken.assemblyline.imprinter.TileEntityImprinter; -import com.builtbroken.assemblyline.machine.TileEntityBatteryBox; -import com.builtbroken.assemblyline.machine.TileEntityReleaseValve; -import com.builtbroken.assemblyline.machine.TileEntitySink; -import com.builtbroken.assemblyline.machine.TileEntityTank; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; -import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/client/SoundHandler.java b/src/main/java/resonantinduction/assemblyline/client/SoundHandler.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/client/SoundHandler.java rename to src/main/java/resonantinduction/assemblyline/client/SoundHandler.java index 51b1083b7..a202470a2 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/SoundHandler.java +++ b/src/main/java/resonantinduction/assemblyline/client/SoundHandler.java @@ -1,10 +1,8 @@ -package com.builtbroken.assemblyline.client; +package resonantinduction.assemblyline.client; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.ForgeSubscribe; - -import com.builtbroken.assemblyline.AssemblyLine; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java b/src/main/java/resonantinduction/assemblyline/client/gui/EnumTaskIcon.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java rename to src/main/java/resonantinduction/assemblyline/client/gui/EnumTaskIcon.java index eec91ea29..30f59745b 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/EnumTaskIcon.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; /** Used to reference icons in the gui coder sheet * diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiBatteryBox.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiBatteryBox.java index 8ae9f1479..c003c509e 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiBatteryBox.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -7,13 +7,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.machine.ContainerBatteryBox; +import resonantinduction.assemblyline.machine.TileEntityBatteryBox; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; - -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.machine.ContainerBatteryBox; -import com.builtbroken.assemblyline.machine.TileEntityBatteryBox; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEditTask.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEditTask.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiEditTask.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiEditTask.java index ffa421ec9..6302a7833 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEditTask.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEditTask.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -8,11 +8,11 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; import universalelectricity.api.vector.Vector2; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.minecraft.prefab.invgui.GuiBase; import com.builtbroken.minecraft.prefab.invgui.GuiMessageBox; import com.builtbroken.minecraft.prefab.invgui.IMessageBoxDialog; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderBase.java similarity index 85% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderBase.java index 2813cecea..03fd60ce3 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderBase.java @@ -1,10 +1,10 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.CommonProxy; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.CommonProxy; import com.builtbroken.minecraft.prefab.TileEntityMachine; import com.builtbroken.minecraft.prefab.invgui.ContainerFake; import com.builtbroken.minecraft.prefab.invgui.GuiMachineContainer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderCoder.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderCoder.java index 6de742253..04d402e09 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderCoder.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; @@ -6,7 +6,8 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; + import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage; import com.builtbroken.minecraft.prefab.invgui.GuiButtonImage.ButtonIcon; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderHelp.java similarity index 71% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderHelp.java index 6699e9ae8..6206956b1 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderHelp.java @@ -1,11 +1,10 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; - public class GuiEncoderHelp extends GuiEncoderBase { public static final ResourceLocation TEXTURE_CODE_BACK = new ResourceLocation(AssemblyLine.DOMAIN, AssemblyLine.GUI_DIRECTORY + "gui_encoder_coder.png"); diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderInventory.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderInventory.java index 5ae2d1c94..ef66daf38 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiEncoderInventory.java @@ -1,14 +1,13 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.machine.encoder.ContainerEncoder; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.machine.encoder.ContainerEncoder; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiImprinter.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiImprinter.java similarity index 88% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiImprinter.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiImprinter.java index cfa1d7580..48260ca24 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiImprinter.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiImprinter.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -6,9 +6,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.imprinter.ContainerImprinter; -import com.builtbroken.assemblyline.imprinter.TileEntityImprinter; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.imprinter.ContainerImprinter; +import resonantinduction.assemblyline.imprinter.TileEntityImprinter; + import com.builtbroken.minecraft.TranslationHelper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiProcessor.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiProcessor.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiProcessor.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiProcessor.java index f1e180fd2..1928d18c2 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiProcessor.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiProcessor.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; @@ -7,10 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.machine.processor.ContainerProcessor; -import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.machine.processor.ContainerProcessor; +import resonantinduction.assemblyline.machine.processor.TileEntityProcessor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTask.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiTask.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiTask.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiTask.java index 0b83bfe9f..503703b92 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTask.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiTask.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -7,10 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.api.coding.IRedirectTask; -import com.builtbroken.assemblyline.api.coding.ITask; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.api.coding.IRedirectTask; +import resonantinduction.assemblyline.api.coding.ITask; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTaskList.java b/src/main/java/resonantinduction/assemblyline/client/gui/GuiTaskList.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/gui/GuiTaskList.java rename to src/main/java/resonantinduction/assemblyline/client/gui/GuiTaskList.java index 00e8b476a..95b302127 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTaskList.java +++ b/src/main/java/resonantinduction/assemblyline/client/gui/GuiTaskList.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.gui; +package resonantinduction.assemblyline.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; @@ -6,13 +6,14 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.api.coding.IProgram; -import com.builtbroken.assemblyline.api.coding.IRedirectTask; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.armbot.command.TaskEnd; -import com.builtbroken.assemblyline.armbot.command.TaskIdle; -import com.builtbroken.assemblyline.armbot.command.TaskStart; -import com.builtbroken.assemblyline.machine.encoder.TileEntityEncoder; +import resonantinduction.assemblyline.api.coding.IProgram; +import resonantinduction.assemblyline.api.coding.IRedirectTask; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.armbot.command.TaskEnd; +import resonantinduction.assemblyline.armbot.command.TaskIdle; +import resonantinduction.assemblyline.armbot.command.TaskStart; +import resonantinduction.assemblyline.machine.encoder.TileEntityEncoder; + import com.builtbroken.minecraft.interfaces.IScroll; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelAdvancedHopper.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelAdvancedHopper.java index cfecaa201..c6019539d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelAdvancedHopper.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelAngledBelt.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelAngledBelt.java index cbab102ac..316f95d01 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelAngledBelt.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelArmbot.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelArmbot.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelArmbot.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelArmbot.java index 9c7ee2484..46de077ae 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelArmbot.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCenterTank.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelCenterTank.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelCenterTank.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelCenterTank.java index 160d62bdf..0ccbaa0c6 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCenterTank.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelCenterTank.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelConstructionPump.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelConstructionPump.java index d1b264575..6cbd84dad 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelConstructionPump.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelConveyorBelt.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelConveyorBelt.java index 3ddee64ae..a2acf2889 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelConveyorBelt.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCopperWire.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelCopperWire.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelCopperWire.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelCopperWire.java index df4982c21..7132c6b5e 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCopperWire.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelCopperWire.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCornerTank.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelCornerTank.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelCornerTank.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelCornerTank.java index bd3600d0d..deec4a991 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCornerTank.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelCornerTank.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCrusher.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelCrusher.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelCrusher.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelCrusher.java index 6699a9712..10dfec6ed 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelCrusher.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelCrusher.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelElecFurnace.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelElecFurnace.java index 842f66339..2133f3f39 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelElecFurnace.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelEngine.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelEngine.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelEngine.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelEngine.java index 80f6c9a02..14fe801c5 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelEngine.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelEngine.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelFrackingPipe.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelFrackingPipe.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelFrackingPipe.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelFrackingPipe.java index 5f5572e8f..a54b3c2b1 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelFrackingPipe.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelFrackingPipe.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelFurnace.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelFurnace.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelFurnace.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelFurnace.java index 7a9680678..56583500f 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelFurnace.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelFurnace.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearPiston.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelGearPiston.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelGearPiston.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelGearPiston.java index a38604787..ae34fad8d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearPiston.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelGearPiston.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearRod.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelGearRod.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelGearRod.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelGearRod.java index cfec419a0..d6e48e5e5 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearRod.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelGearRod.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGenerator.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelGenerator.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelGenerator.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelGenerator.java index f6dcc9ffa..8d2a0f5cb 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelGenerator.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGrinder.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelGrinder.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelGrinder.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelGrinder.java index 7b52c4964..ae6d35595 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelGrinder.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelGrinder.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelHelper.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelHelper.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelHelper.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelHelper.java index 051e059b1..5b9fa6b53 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelHelper.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelHelper.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import static org.lwjgl.opengl.GL11.GL_QUADS; import static org.lwjgl.opengl.GL11.glBegin; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLargePipe.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelLargePipe.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelLargePipe.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelLargePipe.java index 71fd20d79..bb0292a5f 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLargePipe.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelLargePipe.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLaserTile.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelLaserTile.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelLaserTile.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelLaserTile.java index 562035a53..70787e1e4 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLaserTile.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelLaserTile.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelLiquidTankCorner.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelLiquidTankCorner.java index d11cb2845..112bb23b6 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelLiquidTankCorner.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelMachine.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelMachine.java similarity index 73% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelMachine.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelMachine.java index 8773a2980..1d35e4033 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelMachine.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelMachine.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelManipulator.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelManipulator.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelManipulator.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelManipulator.java index d29c30567..d89db60d1 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelManipulator.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelManipulator.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelMiningLaserGun.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelMiningLaserGun.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelMiningLaserGun.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelMiningLaserGun.java index 329c657bc..a2fe0ea44 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelMiningLaserGun.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelMiningLaserGun.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelOpenTrough.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelOpenTrough.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelOpenTrough.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelOpenTrough.java index 4b84b0cff..15d525022 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelOpenTrough.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelOpenTrough.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelPump.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelPump.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelPump.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelPump.java index 5c1371dc4..b21d45023 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelPump.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelPump.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelRejectorPiston.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelRejectorPiston.java index 902949d8c..c3cc0f493 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelRejectorPiston.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelReleaseValve.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelReleaseValve.java index 2520e17fb..bee6958b3 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelReleaseValve.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSink.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelSink.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelSink.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelSink.java index 6f547a9e1..c66b46f29 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSink.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelSink.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelSmallFluidCan.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelSmallFluidCan.java index 201fb44b6..ffac86b40 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelSmallFluidCan.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelSolarPanel.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelSolarPanel.java index d97b8e646..0c54d6421 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelSolarPanel.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamGen.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelSteamGen.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamGen.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelSteamGen.java index 5343e985e..aa5654c50 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamGen.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelSteamGen.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelSteamTurbine.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelSteamTurbine.java index e507154ed..47c5fefc4 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelSteamTurbine.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTank.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelTank.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelTank.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelTank.java index 7bbcf17bb..2014be2e7 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTank.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelTank.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTankSide.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelTankSide.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelTankSide.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelTankSide.java index 63671d44e..db10efdb7 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTankSide.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelTankSide.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTestCar.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelTestCar.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelTestCar.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelTestCar.java index 1101eca0f..fcc4b2732 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTestCar.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelTestCar.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTurkey.java b/src/main/java/resonantinduction/assemblyline/client/model/ModelTurkey.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/model/ModelTurkey.java rename to src/main/java/resonantinduction/assemblyline/client/model/ModelTurkey.java index 82deefa97..d6203d8aa 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/model/ModelTurkey.java +++ b/src/main/java/resonantinduction/assemblyline/client/model/ModelTurkey.java @@ -4,7 +4,7 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX -package com.builtbroken.assemblyline.client.model; +package resonantinduction.assemblyline.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderHelper.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java rename to src/main/java/resonantinduction/assemblyline/client/render/BlockRenderHelper.java index a16ec0660..cea7dad4f 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderHelper.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,14 +7,13 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelConstructionPump; -import com.builtbroken.assemblyline.client.model.ModelGearRod; -import com.builtbroken.assemblyline.client.model.ModelGenerator; -import com.builtbroken.assemblyline.client.model.ModelPump; -import com.builtbroken.assemblyline.client.model.ModelSink; - +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelConstructionPump; +import resonantinduction.assemblyline.client.model.ModelGearRod; +import resonantinduction.assemblyline.client.model.ModelGenerator; +import resonantinduction.assemblyline.client.model.ModelPump; +import resonantinduction.assemblyline.client.model.ModelSink; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderInfo.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java rename to src/main/java/resonantinduction/assemblyline/client/render/BlockRenderInfo.java index 2a58ee99e..73f80aba3 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderInfo.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderingHandler.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java rename to src/main/java/resonantinduction/assemblyline/client/render/BlockRenderingHandler.java index 8ea8bc9d6..a356ccb1c 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/BlockRenderingHandler.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,17 +7,16 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelConveyorBelt; -import com.builtbroken.assemblyline.client.model.ModelCrusher; -import com.builtbroken.assemblyline.client.model.ModelGrinder; -import com.builtbroken.assemblyline.client.model.ModelMachine; -import com.builtbroken.assemblyline.client.model.ModelManipulator; -import com.builtbroken.assemblyline.client.model.ModelRejectorPiston; -import com.builtbroken.assemblyline.client.model.ModelSolarPanel; -import com.builtbroken.assemblyline.redstone.BlockAdvancedHopper; - +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelConveyorBelt; +import resonantinduction.assemblyline.client.model.ModelCrusher; +import resonantinduction.assemblyline.client.model.ModelGrinder; +import resonantinduction.assemblyline.client.model.ModelMachine; +import resonantinduction.assemblyline.client.model.ModelManipulator; +import resonantinduction.assemblyline.client.model.ModelRejectorPiston; +import resonantinduction.assemblyline.client.model.ModelSolarPanel; +import resonantinduction.assemblyline.redstone.BlockAdvancedHopper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java b/src/main/java/resonantinduction/assemblyline/client/render/EntityFakeBlock.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java rename to src/main/java/resonantinduction/assemblyline/client/render/EntityFakeBlock.java index b3cc213cf..7c301c00d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/EntityFakeBlock.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java b/src/main/java/resonantinduction/assemblyline/client/render/ItemPipeRenderer.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java rename to src/main/java/resonantinduction/assemblyline/client/render/ItemPipeRenderer.java index a7f80c54d..d12576165 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/ItemPipeRenderer.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -6,11 +6,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelReleaseValve; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; - +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelReleaseValve; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java b/src/main/java/resonantinduction/assemblyline/client/render/ItemRenderFluidCan.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java rename to src/main/java/resonantinduction/assemblyline/client/render/ItemRenderFluidCan.java index 2b15b3760..930663a19 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/ItemRenderFluidCan.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -8,11 +8,10 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelSmallFluidCan; -import com.builtbroken.assemblyline.machine.ItemFluidCan; - +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelSmallFluidCan; +import resonantinduction.assemblyline.machine.ItemFluidCan; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java b/src/main/java/resonantinduction/assemblyline/client/render/ItemTankRenderer.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java rename to src/main/java/resonantinduction/assemblyline/client/render/ItemTankRenderer.java index 9f8a780f7..7605b1de5 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/ItemTankRenderer.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -9,11 +9,10 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelTankSide; -import com.builtbroken.assemblyline.machine.BlockTank; - +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelTankSide; +import resonantinduction.assemblyline.machine.BlockTank; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderAdvancedHopper.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderAdvancedHopper.java index ba6ec94c5..9b1f1cbee 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderAdvancedHopper.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -6,10 +6,9 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelAdvancedHopper; -import com.builtbroken.assemblyline.redstone.TileEntityAdvancedHopper; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelAdvancedHopper; +import resonantinduction.assemblyline.redstone.TileEntityAdvancedHopper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderArmbot.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderArmbot.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderArmbot.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderArmbot.java index 8d4aa09ad..9aa30cce2 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderArmbot.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderArmbot.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; @@ -14,12 +14,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.armbot.TileEntityArmbot; +import resonantinduction.assemblyline.client.model.ModelArmbot; import universalelectricity.api.vector.Vector3; - -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.armbot.TileEntityArmbot; -import com.builtbroken.assemblyline.client.model.ModelArmbot; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockEntity.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderBlockEntity.java index cdb87d77a..26817caa0 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockEntity.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockSolarPanel.java similarity index 84% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderBlockSolarPanel.java index 7e48dd410..fddb7e79b 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockSolarPanel.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,9 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelSolarPanel; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelSolarPanel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockWire.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockWire.java similarity index 85% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockWire.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderBlockWire.java index 61e2d6dbe..66921a347 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockWire.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderBlockWire.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -7,10 +7,9 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelCopperWire; -import com.builtbroken.assemblyline.transmit.TileEntityWire; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelCopperWire; +import resonantinduction.assemblyline.transmit.TileEntityWire; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderConstructionPump.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderConstructionPump.java index 7411fa059..79df2136d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderConstructionPump.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,10 +6,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelConstructionPump; -import com.builtbroken.assemblyline.fluid.pump.TileEntityConstructionPump; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelConstructionPump; +import resonantinduction.assemblyline.fluid.pump.TileEntityConstructionPump; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderConveyorBelt.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderConveyorBelt.java index f8b84693b..f58d3232b 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderConveyorBelt.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,12 +6,11 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelAngledBelt; -import com.builtbroken.assemblyline.client.model.ModelConveyorBelt; -import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt; -import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelAngledBelt; +import resonantinduction.assemblyline.client.model.ModelConveyorBelt; +import resonantinduction.assemblyline.machine.belt.TileEntityConveyorBelt; +import resonantinduction.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderCrate.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderCrate.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderCrate.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderCrate.java index 5168937a0..beb65f412 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderCrate.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderCrate.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -17,10 +17,8 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; +import resonantinduction.assemblyline.machine.TileEntityCrate; import universalelectricity.api.vector.Vector3; - -import com.builtbroken.assemblyline.machine.TileEntityCrate; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderDetector.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderDetector.java similarity index 77% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderDetector.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderDetector.java index 5facd53b5..c8bbf7bb7 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderDetector.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderDetector.java @@ -1,17 +1,15 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; -import static com.builtbroken.assemblyline.client.model.ModelHelper.drawCuboid; -import static com.builtbroken.assemblyline.client.model.ModelHelper.setGlobalTextureResolution; -import static com.builtbroken.assemblyline.client.model.ModelHelper.setTextureClip; -import static com.builtbroken.assemblyline.client.model.ModelHelper.setTextureSubResolution; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glTranslated; +import static resonantinduction.assemblyline.client.model.ModelHelper.drawCuboid; +import static resonantinduction.assemblyline.client.model.ModelHelper.setGlobalTextureResolution; +import static resonantinduction.assemblyline.client.model.ModelHelper.setTextureClip; +import static resonantinduction.assemblyline.client.model.ModelHelper.setTextureSubResolution; +import resonantinduction.assemblyline.client.model.ModelHelper; import net.minecraft.tileentity.TileEntity; import universalelectricity.api.vector.Vector3; - -import com.builtbroken.assemblyline.client.model.ModelHelper; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderFluidHelper.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderFluidHelper.java index 5deaea610..254c0569b 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderFluidHelper.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFrackingPipe.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderFrackingPipe.java similarity index 83% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderFrackingPipe.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderFrackingPipe.java index 3bad3508f..3ceb5df2d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFrackingPipe.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderFrackingPipe.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelFrackingPipe; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelFrackingPipe; /** @author Archadia */ public class RenderFrackingPipe extends TileEntitySpecialRenderer diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFurnace.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderFurnace.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderFurnace.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderFurnace.java index 10d43ca80..4670521c1 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderFurnace.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderFurnace.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,9 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelFurnace; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelFurnace; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearPiston.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderGearPiston.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderGearPiston.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderGearPiston.java index e0ac8562d..8d6620836 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearPiston.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderGearPiston.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,9 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelGearPiston; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelGearPiston; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearRod.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderGearRod.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderGearRod.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderGearRod.java index 61328c862..998950784 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearRod.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderGearRod.java @@ -1,12 +1,11 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.client.model.ModelGearRod; - +import resonantinduction.assemblyline.client.model.ModelGearRod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGenerator.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderGenerator.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderGenerator.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderGenerator.java index fb8fd4b96..691941730 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderGenerator.java @@ -1,12 +1,11 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.client.model.ModelGenerator; - +import resonantinduction.assemblyline.client.model.ModelGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderHelper.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderHelper.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderHelper.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderHelper.java index ba814a35a..b0dd6072c 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderHelper.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderHelper.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderImprintable.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderImprintable.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderImprintable.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderImprintable.java index a2011d1c2..519dea62b 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderImprintable.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderImprintable.java @@ -1,17 +1,15 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import java.util.ArrayList; +import resonantinduction.assemblyline.imprinter.ItemImprinter; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; - -import com.builtbroken.assemblyline.imprinter.ItemImprinter; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderManipulator.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderManipulator.java similarity index 88% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderManipulator.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderManipulator.java index b1b68753a..6a803e152 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderManipulator.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderManipulator.java @@ -1,14 +1,13 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelManipulator; -import com.builtbroken.assemblyline.machine.TileEntityManipulator; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelManipulator; +import resonantinduction.assemblyline.machine.TileEntityManipulator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaser.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaser.java similarity index 81% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaser.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaser.java index 07d46c240..39213e224 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaser.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaser.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,9 +6,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelLaserTile; -import com.builtbroken.assemblyline.machine.TileLaserSentry; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelLaserTile; +import resonantinduction.assemblyline.machine.TileLaserSentry; /** @author Darkguardsman */ public class RenderMiningLaser extends TileEntitySpecialRenderer diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaserGun.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaserGun.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaserGun.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaserGun.java index 515ee4194..d730b2d9c 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderMiningLaserGun.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderMiningLaserGun.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -7,9 +7,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelMiningLaserGun; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelMiningLaserGun; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderPipe.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderPipe.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderPipe.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderPipe.java index ee4ce2feb..dcbe4ed24 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderPipe.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderPipe.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import java.util.HashMap; @@ -9,12 +9,13 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelLargePipe; -import com.builtbroken.assemblyline.client.model.ModelOpenTrough; -import com.builtbroken.assemblyline.fluid.pipes.EnumPipeType; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; -import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelLargePipe; +import resonantinduction.assemblyline.client.model.ModelOpenTrough; +import resonantinduction.assemblyline.fluid.pipes.EnumPipeType; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; +import resonantinduction.assemblyline.fluid.pipes.TileEntityPipe; + import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderProcessor.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderProcessor.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderProcessor.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderProcessor.java index 5eec3fe9f..d65c44c47 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderProcessor.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderProcessor.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -7,11 +7,10 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelCrusher; -import com.builtbroken.assemblyline.client.model.ModelGrinder; -import com.builtbroken.assemblyline.machine.processor.TileEntityProcessor; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelCrusher; +import resonantinduction.assemblyline.client.model.ModelGrinder; +import resonantinduction.assemblyline.machine.processor.TileEntityProcessor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderPump.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderPump.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderPump.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderPump.java index d53cb2df1..bbbacefa3 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderPump.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderPump.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,10 +6,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelPump; -import com.builtbroken.assemblyline.fluid.pump.TileEntityStarterPump; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelPump; +import resonantinduction.assemblyline.fluid.pump.TileEntityStarterPump; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderRejector.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderRejector.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderRejector.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderRejector.java index 472f25af7..e3ddb58d5 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderRejector.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderRejector.java @@ -1,14 +1,13 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelRejectorPiston; -import com.builtbroken.assemblyline.machine.TileEntityRejector; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelRejectorPiston; +import resonantinduction.assemblyline.machine.TileEntityRejector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderReleaseValve.java similarity index 84% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderReleaseValve.java index 6c61ca5d7..4b6d893e3 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderReleaseValve.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,11 +6,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelLargePipe; -import com.builtbroken.assemblyline.client.model.ModelReleaseValve; -import com.builtbroken.assemblyline.machine.TileEntityReleaseValve; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelLargePipe; +import resonantinduction.assemblyline.client.model.ModelReleaseValve; +import resonantinduction.assemblyline.machine.TileEntityReleaseValve; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderSink.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderSink.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderSink.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderSink.java index 913a6e771..37f5f030d 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderSink.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderSink.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -6,9 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelSink; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelSink; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderSteamGen.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderSteamGen.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderSteamGen.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderSteamGen.java index d0223683f..571261aa9 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderSteamGen.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderSteamGen.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -7,10 +7,11 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelMachine; -import com.builtbroken.assemblyline.client.model.ModelSteamGen; -import com.builtbroken.assemblyline.client.model.ModelSteamTurbine; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelMachine; +import resonantinduction.assemblyline.client.model.ModelSteamGen; +import resonantinduction.assemblyline.client.model.ModelSteamTurbine; + import com.builtbroken.minecraft.prefab.TileEntityMachine; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTank.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderTank.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderTank.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderTank.java index 91a234e87..9574a24e0 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTank.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderTank.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -8,8 +8,9 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.client.model.ModelTankSide; -import com.builtbroken.assemblyline.machine.TileEntityTank; +import resonantinduction.assemblyline.client.model.ModelTankSide; +import resonantinduction.assemblyline.machine.TileEntityTank; + import com.builtbroken.minecraft.helpers.ColorCode; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTestCar.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderTestCar.java similarity index 88% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderTestCar.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderTestCar.java index 4ed1d984a..37b08f73c 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTestCar.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderTestCar.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.Render; @@ -8,10 +8,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelTestCar; -import com.builtbroken.assemblyline.entities.prefab.EntityAdvanced; - +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelTestCar; +import resonantinduction.assemblyline.entities.prefab.EntityAdvanced; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTurkey.java b/src/main/java/resonantinduction/assemblyline/client/render/RenderTurkey.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/client/render/RenderTurkey.java rename to src/main/java/resonantinduction/assemblyline/client/render/RenderTurkey.java index 874e5b04a..780687f3a 100644 --- a/src/main/java/com/builtbroken/assemblyline/client/render/RenderTurkey.java +++ b/src/main/java/resonantinduction/assemblyline/client/render/RenderTurkey.java @@ -1,16 +1,14 @@ -package com.builtbroken.assemblyline.client.render; +package resonantinduction.assemblyline.client.render; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.model.ModelTurkey; +import resonantinduction.assemblyline.entities.EntityTurkey; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; - -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.model.ModelTurkey; -import com.builtbroken.assemblyline.entities.EntityTurkey; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java b/src/main/java/resonantinduction/assemblyline/crafting/BlockCraftingTable.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java rename to src/main/java/resonantinduction/assemblyline/crafting/BlockCraftingTable.java index f1257b574..d4cec550d 100644 --- a/src/main/java/com/builtbroken/assemblyline/crafting/BlockCraftingTable.java +++ b/src/main/java/resonantinduction/assemblyline/crafting/BlockCraftingTable.java @@ -1,5 +1,6 @@ -package com.builtbroken.assemblyline.crafting; +package resonantinduction.assemblyline.crafting; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -7,7 +8,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.prefab.BlockMachine; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/crafting/TileEntityCraftingTable.java b/src/main/java/resonantinduction/assemblyline/crafting/TileEntityCraftingTable.java similarity index 71% rename from src/main/java/com/builtbroken/assemblyline/crafting/TileEntityCraftingTable.java rename to src/main/java/resonantinduction/assemblyline/crafting/TileEntityCraftingTable.java index 2e9f05713..3bbc38727 100644 --- a/src/main/java/com/builtbroken/assemblyline/crafting/TileEntityCraftingTable.java +++ b/src/main/java/resonantinduction/assemblyline/crafting/TileEntityCraftingTable.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.crafting; +package resonantinduction.assemblyline.crafting; import com.builtbroken.minecraft.prefab.TileEntityInv; diff --git a/src/main/java/com/builtbroken/assemblyline/entities/EntityFarmEgg.java b/src/main/java/resonantinduction/assemblyline/entities/EntityFarmEgg.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/entities/EntityFarmEgg.java rename to src/main/java/resonantinduction/assemblyline/entities/EntityFarmEgg.java index 7cbb5cd97..c428ac3b5 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/EntityFarmEgg.java +++ b/src/main/java/resonantinduction/assemblyline/entities/EntityFarmEgg.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.entities; +package resonantinduction.assemblyline.entities; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/resonantinduction/assemblyline/entities/EntityMutantAnimal.java b/src/main/java/resonantinduction/assemblyline/entities/EntityMutantAnimal.java new file mode 100644 index 000000000..a5dfd5382 --- /dev/null +++ b/src/main/java/resonantinduction/assemblyline/entities/EntityMutantAnimal.java @@ -0,0 +1,6 @@ +package resonantinduction.assemblyline.entities; + +public class EntityMutantAnimal +{ + +} diff --git a/src/main/java/com/builtbroken/assemblyline/entities/EntityTurkey.java b/src/main/java/resonantinduction/assemblyline/entities/EntityTurkey.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/entities/EntityTurkey.java rename to src/main/java/resonantinduction/assemblyline/entities/EntityTurkey.java index 1ba2e6e62..8c3bed617 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/EntityTurkey.java +++ b/src/main/java/resonantinduction/assemblyline/entities/EntityTurkey.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.entities; +package resonantinduction.assemblyline.entities; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/com/builtbroken/assemblyline/entities/EnumBird.java b/src/main/java/resonantinduction/assemblyline/entities/EnumBird.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/entities/EnumBird.java rename to src/main/java/resonantinduction/assemblyline/entities/EnumBird.java index 23edfb4ec..23f5cf26f 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/EnumBird.java +++ b/src/main/java/resonantinduction/assemblyline/entities/EnumBird.java @@ -1,15 +1,13 @@ -package com.builtbroken.assemblyline.entities; +package resonantinduction.assemblyline.entities; import java.awt.Color; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; - -import com.builtbroken.assemblyline.AssemblyLine; - import cpw.mods.fml.common.registry.EntityRegistry; /** Enum of different birds that can be spawned by an egg or in the world threw normal spawning diff --git a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityAdvanced.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java rename to src/main/java/resonantinduction/assemblyline/entities/prefab/EntityAdvanced.java index 3494f7a74..830adf90a 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java +++ b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityAdvanced.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.entities.prefab; +package resonantinduction.assemblyline.entities.prefab; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityTestCar.java similarity index 82% rename from src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java rename to src/main/java/resonantinduction/assemblyline/entities/prefab/EntityTestCar.java index 3d119a81f..c990d6688 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java +++ b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityTestCar.java @@ -1,9 +1,8 @@ -package com.builtbroken.assemblyline.entities.prefab; +package resonantinduction.assemblyline.entities.prefab; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.world.World; -import com.builtbroken.assemblyline.ALRecipeLoader; - public class EntityTestCar extends EntityVehicle { diff --git a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityVehicle.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java rename to src/main/java/resonantinduction/assemblyline/entities/prefab/EntityVehicle.java index c75e63473..73e485975 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java +++ b/src/main/java/resonantinduction/assemblyline/entities/prefab/EntityVehicle.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.entities.prefab; +package resonantinduction.assemblyline.entities.prefab; import java.util.List; +import resonantinduction.assemblyline.network.ISimplePacketReceiver; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -12,7 +13,6 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import com.builtbroken.assemblyline.network.ISimplePacketReceiver; import com.builtbroken.minecraft.interfaces.IControlReceiver; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java b/src/main/java/resonantinduction/assemblyline/entities/prefab/ItemVehicleSpawn.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java rename to src/main/java/resonantinduction/assemblyline/entities/prefab/ItemVehicleSpawn.java index f8fca94a5..7d09dcfce 100644 --- a/src/main/java/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java +++ b/src/main/java/resonantinduction/assemblyline/entities/prefab/ItemVehicleSpawn.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.entities.prefab; +package resonantinduction.assemblyline.entities.prefab; import java.util.List; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +14,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.minecraft.DarkCore; /** Basic item used to spawn a vehicle diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/EnumFluid.java b/src/main/java/resonantinduction/assemblyline/fluid/EnumFluid.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/fluid/EnumFluid.java rename to src/main/java/resonantinduction/assemblyline/fluid/EnumFluid.java index b992d1ffe..20d59e362 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/EnumFluid.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/EnumFluid.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/EnumGas.java b/src/main/java/resonantinduction/assemblyline/fluid/EnumGas.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/EnumGas.java rename to src/main/java/resonantinduction/assemblyline/fluid/EnumGas.java index 7d1bcc320..d5a35781a 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/EnumGas.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/EnumGas.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import com.builtbroken.common.science.ChemElement; import com.builtbroken.common.science.ChemicalCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/FilteredTank.java b/src/main/java/resonantinduction/assemblyline/fluid/FilteredTank.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/FilteredTank.java rename to src/main/java/resonantinduction/assemblyline/fluid/FilteredTank.java index cd08a8e97..207d559fa 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/FilteredTank.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/FilteredTank.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/FluidCraftingHandler.java b/src/main/java/resonantinduction/assemblyline/fluid/FluidCraftingHandler.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/FluidCraftingHandler.java rename to src/main/java/resonantinduction/assemblyline/fluid/FluidCraftingHandler.java index 148fff182..42256054b 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/FluidCraftingHandler.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/FluidCraftingHandler.java @@ -1,9 +1,11 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import resonantinduction.assemblyline.fluid.network.IFluidRecipeCrafter; +import resonantinduction.assemblyline.fluid.network.FluidRecipeInfo.SimpleFluidRecipe; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,8 +13,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.builtbroken.assemblyline.fluid.network.FluidRecipeInfo.SimpleFluidRecipe; -import com.builtbroken.assemblyline.fluid.network.IFluidRecipeCrafter; import com.builtbroken.common.Pair; import com.builtbroken.common.Triple; import com.builtbroken.minecraft.FluidHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/Gas.java b/src/main/java/resonantinduction/assemblyline/fluid/Gas.java similarity index 87% rename from src/main/java/com/builtbroken/assemblyline/fluid/Gas.java rename to src/main/java/resonantinduction/assemblyline/fluid/Gas.java index 015f0aea3..d0edcf814 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/Gas.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/Gas.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/GasTank.java b/src/main/java/resonantinduction/assemblyline/fluid/GasTank.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/fluid/GasTank.java rename to src/main/java/resonantinduction/assemblyline/fluid/GasTank.java index 3a6241b03..cb1a27e0d 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/GasTank.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/GasTank.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/LiquidTank.java b/src/main/java/resonantinduction/assemblyline/fluid/LiquidTank.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/fluid/LiquidTank.java rename to src/main/java/resonantinduction/assemblyline/fluid/LiquidTank.java index d931393b0..e52e05566 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/LiquidTank.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/LiquidTank.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid; +package resonantinduction.assemblyline.fluid; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java b/src/main/java/resonantinduction/assemblyline/fluid/network/FluidPressurePack.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/FluidPressurePack.java index bba0f0598..bf12c1840 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/FluidPressurePack.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java b/src/main/java/resonantinduction/assemblyline/fluid/network/FluidRecipeInfo.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/FluidRecipeInfo.java index e593c13c2..4610b212c 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/FluidRecipeInfo.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java b/src/main/java/resonantinduction/assemblyline/fluid/network/IFluidRecipeCrafter.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/IFluidRecipeCrafter.java index d8bdaec6f..38c06c788 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/IFluidRecipeCrafter.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; /** Use this if you want to take advantage of the {@link #FluidCraftingHandler} 's auto crafting * methods to do as little as work as possible to create recipe results diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidContainers.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidContainers.java index 474d7f0fe..73a817315 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidContainers.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.fluid.INetworkFluidPart; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidTiles.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidTiles.java index 65d636ebd..acd4b77dc 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkFluidTiles.java @@ -1,9 +1,11 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; +import resonantinduction.assemblyline.api.fluid.INetworkFluidPart; +import resonantinduction.assemblyline.fluid.FluidCraftingHandler; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; @@ -13,8 +15,6 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart; -import com.builtbroken.assemblyline.fluid.FluidCraftingHandler; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.ITileNetwork; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkPipes.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java rename to src/main/java/resonantinduction/assemblyline/fluid/network/NetworkPipes.java index 1aefae7eb..60a4cf829 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/network/NetworkPipes.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.fluid.network; +package resonantinduction.assemblyline.fluid.network; import java.util.EnumSet; import java.util.Map.Entry; +import resonantinduction.assemblyline.api.fluid.INetworkPipe; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.api.fluid.INetworkPipe; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.prefab.NetworkUpdateHandler; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/BlockPipe.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/BlockPipe.java index 6dc4b788f..64c88a21e 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/BlockPipe.java @@ -1,9 +1,10 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import java.util.ArrayList; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.blocks.BlockHydraulic; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -18,7 +19,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.helpers.ColorCode; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumPipeType.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumPipeType.java index 39280d2b6..7452c7a77 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumPipeType.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColoredId; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumTankTypes.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumTankTypes.java index b6303365c..062027641 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/EnumTankTypes.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColoredId; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/FluidPartsMaterial.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/FluidPartsMaterial.java index 675eff191..6fb4672f3 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/FluidPartsMaterial.java @@ -1,15 +1,15 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import com.builtbroken.minecraft.helpers.ColorCode; /** Enum to hold info about each pipe material. Values are by default and some can change with pipe diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/IPipeType.java similarity index 74% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/IPipeType.java index 2b94aa7e9..d4cae159a 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/IPipeType.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import com.builtbroken.minecraft.helpers.ColorCode.IColoredId; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/ItemBlockPipe.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/ItemBlockPipe.java index 2559174e5..f69e809a3 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/ItemBlockPipe.java @@ -1,7 +1,10 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; import java.util.List; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; +import resonantinduction.assemblyline.machine.TileEntityTank; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -16,10 +19,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; -import com.builtbroken.assemblyline.machine.TileEntityTank; - public class ItemBlockPipe extends ItemBlock { diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java b/src/main/java/resonantinduction/assemblyline/fluid/pipes/TileEntityPipe.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java rename to src/main/java/resonantinduction/assemblyline/fluid/pipes/TileEntityPipe.java index 7d08f7a53..ebb127901 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pipes/TileEntityPipe.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.fluid.pipes; +package resonantinduction.assemblyline.fluid.pipes; +import resonantinduction.assemblyline.api.fluid.INetworkPipe; +import resonantinduction.assemblyline.fluid.network.NetworkPipes; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -7,9 +10,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.fluid.INetworkPipe; -import com.builtbroken.assemblyline.fluid.network.NetworkPipes; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidDevice.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java rename to src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidDevice.java index 50573c48f..9fd4a76af 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidDevice.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.prefab; +package resonantinduction.assemblyline.fluid.prefab; import java.util.Random; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java rename to src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java index 2f7dcc252..818418ec7 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.prefab; +package resonantinduction.assemblyline.fluid.prefab; import java.io.IOException; import java.util.ArrayList; @@ -20,15 +20,15 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.bouncycastle.util.Arrays; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.api.fluid.FluidMasterList; +import resonantinduction.assemblyline.api.fluid.INetworkFluidPart; +import resonantinduction.assemblyline.fluid.network.NetworkFluidTiles; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; +import resonantinduction.assemblyline.network.ISimplePacketReceiver; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.api.fluid.FluidMasterList; -import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart; -import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; -import com.builtbroken.assemblyline.network.ISimplePacketReceiver; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.ITileNetwork; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidStorage.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java rename to src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidStorage.java index 503c0040b..ee41ed7f5 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/prefab/TileEntityFluidStorage.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.prefab; +package resonantinduction.assemblyline.fluid.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockConstructionPump.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/BlockConstructionPump.java index a8536bf08..34b93405e 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockConstructionPump.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -14,10 +18,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.tilenetwork.prefab.NetworkTileEntities; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockDrain.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/BlockDrain.java index b1743f322..d09ab0f88 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockDrain.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockHydraulic; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLivingBase; @@ -15,8 +17,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; import com.builtbroken.common.Pair; public class BlockDrain extends BlockHydraulic diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockPumpMachine.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/BlockPumpMachine.java index 44b6f3f48..9092b8f70 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/BlockPumpMachine.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -11,9 +14,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/LiquidPathFinder.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/LiquidPathFinder.java index fee9c54c3..6ceb94603 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/LiquidPathFinder.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityConstructionPump.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityConstructionPump.java index 26d255984..6170f3897 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityConstructionPump.java @@ -1,10 +1,13 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.Map.Entry; +import resonantinduction.assemblyline.api.fluid.IDrain; +import resonantinduction.assemblyline.api.fluid.INetworkPipe; +import resonantinduction.assemblyline.fluid.network.NetworkFluidTiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -18,9 +21,6 @@ import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; -import com.builtbroken.assemblyline.api.fluid.IDrain; -import com.builtbroken.assemblyline.api.fluid.INetworkPipe; -import com.builtbroken.assemblyline.fluid.network.NetworkFluidTiles; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.tilenetwork.ITileConnector; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityDrain.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityDrain.java index 1391387a6..ee66c1a48 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityDrain.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.ArrayList; import java.util.HashMap; @@ -6,6 +6,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.api.fluid.IDrain; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidDevice; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -17,8 +19,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.fluid.IDrain; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidDevice; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.FluidHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityStarterPump.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java rename to src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityStarterPump.java index 17ed3c06e..3698fca06 100644 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java +++ b/src/main/java/resonantinduction/assemblyline/fluid/pump/TileEntityStarterPump.java @@ -1,8 +1,9 @@ -package com.builtbroken.assemblyline.fluid.pump; +package resonantinduction.assemblyline.fluid.pump; import java.util.Iterator; import java.util.Set; +import resonantinduction.assemblyline.api.fluid.IDrain; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -12,7 +13,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.fluid.IDrain; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.interfaces.IToolReadOut; diff --git a/src/main/java/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java b/src/main/java/resonantinduction/assemblyline/generators/BlockSmallSteamGen.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java rename to src/main/java/resonantinduction/assemblyline/generators/BlockSmallSteamGen.java index 041bc697d..db081025e 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java +++ b/src/main/java/resonantinduction/assemblyline/generators/BlockSmallSteamGen.java @@ -1,9 +1,13 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import java.util.List; import java.util.Random; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderSteamGen; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -15,10 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderSteamGen; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/generators/BlockSolarPanel.java b/src/main/java/resonantinduction/assemblyline/generators/BlockSolarPanel.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/generators/BlockSolarPanel.java rename to src/main/java/resonantinduction/assemblyline/generators/BlockSolarPanel.java index ebff56d55..0c9bf3aa5 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/BlockSolarPanel.java +++ b/src/main/java/resonantinduction/assemblyline/generators/BlockSolarPanel.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderBlockSolarPanel; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,10 +15,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderBlockSolarPanel; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java b/src/main/java/resonantinduction/assemblyline/generators/ContainerCoalGenerator.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java rename to src/main/java/resonantinduction/assemblyline/generators/ContainerCoalGenerator.java index c6e3ae650..ef5096587 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/generators/ContainerCoalGenerator.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarBox.java similarity index 75% rename from src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java rename to src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarBox.java index 7d965c4d3..bb64e2265 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarBox.java +++ b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarBox.java @@ -1,6 +1,6 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; -import com.builtbroken.assemblyline.machine.TileEntityGenerator; +import resonantinduction.assemblyline.machine.TileEntityGenerator; /** TileEntity that acts as the connection node for the solar panel */ public class TileEntitySolarBox extends TileEntityGenerator diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarPanel.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java rename to src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarPanel.java index 0dd26a106..634673c7a 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java +++ b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySolarPanel.java @@ -1,12 +1,11 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import java.util.EnumSet; +import resonantinduction.assemblyline.machine.TileEntityGenerator; import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.machine.TileEntityGenerator; - public class TileEntitySolarPanel extends TileEntityGenerator { public TileEntitySolarPanel() diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamFan.java similarity index 71% rename from src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java rename to src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamFan.java index a10b23073..ead2c781e 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java +++ b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamFan.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; public class TileEntitySteamFan extends TileEntitySteamPiston { diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamGen.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java rename to src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamGen.java index dde918084..7a43e7b64 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java +++ b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamGen.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamPiston.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java rename to src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamPiston.java index 2e4b2cf21..38c083543 100644 --- a/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java +++ b/src/main/java/resonantinduction/assemblyline/generators/TileEntitySteamPiston.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.generators; +package resonantinduction.assemblyline.generators; import java.util.EnumSet; diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/BlockImprinter.java b/src/main/java/resonantinduction/assemblyline/imprinter/BlockImprinter.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/imprinter/BlockImprinter.java rename to src/main/java/resonantinduction/assemblyline/imprinter/BlockImprinter.java index cf7fe9209..5ba18541c 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/BlockImprinter.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/BlockImprinter.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.imprinter; +package resonantinduction.assemblyline.imprinter; import java.util.Random; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.CommonProxy; +import resonantinduction.assemblyline.blocks.BlockAssembly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.item.EntityItem; @@ -14,9 +17,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.CommonProxy; -import com.builtbroken.assemblyline.blocks.BlockAssembly; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java b/src/main/java/resonantinduction/assemblyline/imprinter/ContainerImprinter.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java rename to src/main/java/resonantinduction/assemblyline/imprinter/ContainerImprinter.java index 207e60dad..dd0cd9b77 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/ContainerImprinter.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.imprinter; +package resonantinduction.assemblyline.imprinter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/ItemImprinter.java b/src/main/java/resonantinduction/assemblyline/imprinter/ItemImprinter.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/imprinter/ItemImprinter.java rename to src/main/java/resonantinduction/assemblyline/imprinter/ItemImprinter.java index 19f34ce6d..e3f2f106c 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/ItemImprinter.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/ItemImprinter.java @@ -1,8 +1,10 @@ -package com.builtbroken.assemblyline.imprinter; +package resonantinduction.assemblyline.imprinter; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -13,10 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java b/src/main/java/resonantinduction/assemblyline/imprinter/TileEntityImprinter.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java rename to src/main/java/resonantinduction/assemblyline/imprinter/TileEntityImprinter.java index 199a98f2d..71944a2fd 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/TileEntityImprinter.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.imprinter; +package resonantinduction.assemblyline.imprinter; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.AutoCraftEvent; +import resonantinduction.assemblyline.api.IArmbot; +import resonantinduction.assemblyline.api.IArmbotUseable; +import resonantinduction.assemblyline.api.coding.args.ArgumentData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryCrafting; @@ -12,10 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.AutoCraftEvent; -import com.builtbroken.assemblyline.api.IArmbot; -import com.builtbroken.assemblyline.api.IArmbotUseable; -import com.builtbroken.assemblyline.api.coding.args.ArgumentData; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.TranslationHelper; import com.builtbroken.minecraft.prefab.TileEntityAdvanced; diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java b/src/main/java/resonantinduction/assemblyline/imprinter/prefab/BlockImprintable.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java rename to src/main/java/resonantinduction/assemblyline/imprinter/prefab/BlockImprintable.java index 06c8de406..d25b229f8 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/prefab/BlockImprintable.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.imprinter.prefab; +package resonantinduction.assemblyline.imprinter.prefab; +import resonantinduction.assemblyline.api.IFilterable; +import resonantinduction.assemblyline.blocks.BlockAssembly; +import resonantinduction.assemblyline.imprinter.ItemImprinter; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -9,10 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.builtbroken.assemblyline.api.IFilterable; -import com.builtbroken.assemblyline.blocks.BlockAssembly; -import com.builtbroken.assemblyline.imprinter.ItemImprinter; - /** Extend this block class if a filter is allowed to be placed inside of this block. * * @author Calclavia */ diff --git a/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java b/src/main/java/resonantinduction/assemblyline/imprinter/prefab/TileEntityFilterable.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java rename to src/main/java/resonantinduction/assemblyline/imprinter/prefab/TileEntityFilterable.java index 2daa5b3ea..763660335 100644 --- a/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java +++ b/src/main/java/resonantinduction/assemblyline/imprinter/prefab/TileEntityFilterable.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.imprinter.prefab; +package resonantinduction.assemblyline.imprinter.prefab; import java.util.ArrayList; +import resonantinduction.assemblyline.api.IFilterable; +import resonantinduction.assemblyline.imprinter.ItemImprinter; +import resonantinduction.assemblyline.machine.TileEntityAssembly; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.api.IFilterable; -import com.builtbroken.assemblyline.imprinter.ItemImprinter; -import com.builtbroken.assemblyline.machine.TileEntityAssembly; import com.builtbroken.minecraft.interfaces.IRotatable; public abstract class TileEntityFilterable extends TileEntityAssembly implements IRotatable, IFilterable diff --git a/src/main/java/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java b/src/main/java/resonantinduction/assemblyline/item/BehaviorDispenseEgg.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java rename to src/main/java/resonantinduction/assemblyline/item/BehaviorDispenseEgg.java index 07ce868e4..a3d4daa29 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java +++ b/src/main/java/resonantinduction/assemblyline/item/BehaviorDispenseEgg.java @@ -1,5 +1,6 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; +import resonantinduction.assemblyline.entities.EntityFarmEgg; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; @@ -10,8 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import com.builtbroken.assemblyline.entities.EntityFarmEgg; - public class BehaviorDispenseEgg extends BehaviorDefaultDispenseItem { @Override diff --git a/src/main/java/com/builtbroken/assemblyline/item/EnumTool.java b/src/main/java/resonantinduction/assemblyline/item/EnumTool.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/item/EnumTool.java rename to src/main/java/resonantinduction/assemblyline/item/EnumTool.java index b1f033cc0..b05d791ff 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/EnumTool.java +++ b/src/main/java/resonantinduction/assemblyline/item/EnumTool.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import com.builtbroken.assemblyline.ALRecipeLoader; import com.builtbroken.minecraft.EnumMaterial; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java b/src/main/java/resonantinduction/assemblyline/item/ItemBattery.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java rename to src/main/java/resonantinduction/assemblyline/item/ItemBattery.java index 203cbe311..aa5f26af2 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemBattery.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.item.ItemElectric; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemBlockOre.java b/src/main/java/resonantinduction/assemblyline/item/ItemBlockOre.java similarity index 81% rename from src/main/java/com/builtbroken/assemblyline/item/ItemBlockOre.java rename to src/main/java/resonantinduction/assemblyline/item/ItemBlockOre.java index b40e414a0..f14722618 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemBlockOre.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemBlockOre.java @@ -1,11 +1,10 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockOre.OreData; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockOre.OreData; - public class ItemBlockOre extends ItemBlock { diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemColoredDust.java b/src/main/java/resonantinduction/assemblyline/item/ItemColoredDust.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/item/ItemColoredDust.java rename to src/main/java/resonantinduction/assemblyline/item/ItemColoredDust.java index 940bcc97c..2b69e41ca 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemColoredDust.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemColoredDust.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.prefab.ItemBasic; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemCommonTool.java b/src/main/java/resonantinduction/assemblyline/item/ItemCommonTool.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/item/ItemCommonTool.java rename to src/main/java/resonantinduction/assemblyline/item/ItemCommonTool.java index 4ec3e72e1..f4a3dbece 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemCommonTool.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemCommonTool.java @@ -1,10 +1,11 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.awt.Color; import java.util.ArrayList; import java.util.List; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -31,7 +32,6 @@ import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.oredict.OreDictionary; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.EnumMaterial; import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmBucket.java b/src/main/java/resonantinduction/assemblyline/item/ItemFarmBucket.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/item/ItemFarmBucket.java rename to src/main/java/resonantinduction/assemblyline/item/ItemFarmBucket.java index 519048487..ac9381221 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmBucket.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemFarmBucket.java @@ -1,16 +1,14 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; - -import com.builtbroken.assemblyline.AssemblyLine; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmEgg.java b/src/main/java/resonantinduction/assemblyline/item/ItemFarmEgg.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/item/ItemFarmEgg.java rename to src/main/java/resonantinduction/assemblyline/item/ItemFarmEgg.java index c520b28f5..92b40552e 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmEgg.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemFarmEgg.java @@ -1,13 +1,12 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; +import resonantinduction.assemblyline.entities.EntityFarmEgg; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.builtbroken.assemblyline.entities.EntityFarmEgg; - public class ItemFarmEgg extends Item { public ItemFarmEgg(int par1) diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmFood.java b/src/main/java/resonantinduction/assemblyline/item/ItemFarmFood.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/item/ItemFarmFood.java rename to src/main/java/resonantinduction/assemblyline/item/ItemFarmFood.java index a8fdaf933..f881f1ae9 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemFarmFood.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemFarmFood.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,7 +17,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; import com.builtbroken.minecraft.helpers.HelperMethods; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java b/src/main/java/resonantinduction/assemblyline/item/ItemInstaHole.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java rename to src/main/java/resonantinduction/assemblyline/item/ItemInstaHole.java index 9bbec6ddd..fddf5c653 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemInstaHole.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java b/src/main/java/resonantinduction/assemblyline/item/ItemMiningLaser.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java rename to src/main/java/resonantinduction/assemblyline/item/ItemMiningLaser.java index 775cb7ba1..6ef95d6ab 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemMiningLaser.java @@ -1,9 +1,10 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.awt.Color; import java.util.HashMap; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -26,7 +27,6 @@ import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.item.ItemElectric; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.CoreRegistry; import com.builtbroken.minecraft.DarkCore; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java b/src/main/java/resonantinduction/assemblyline/item/ItemOreDirv.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java rename to src/main/java/resonantinduction/assemblyline/item/ItemOreDirv.java index 45b0b6fd9..3215ecca3 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemOreDirv.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -12,7 +13,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.oredict.OreDictionary; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.EnumMaterial; import com.builtbroken.minecraft.EnumOrePart; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemParts.java b/src/main/java/resonantinduction/assemblyline/item/ItemParts.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/item/ItemParts.java rename to src/main/java/resonantinduction/assemblyline/item/ItemParts.java index 3af685fa3..6687d4f3d 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemParts.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemParts.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -9,7 +10,6 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; import com.builtbroken.minecraft.prefab.ItemBasic; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemReadoutTools.java b/src/main/java/resonantinduction/assemblyline/item/ItemReadoutTools.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/item/ItemReadoutTools.java rename to src/main/java/resonantinduction/assemblyline/item/ItemReadoutTools.java index a45a2cb0a..a8d872a17 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemReadoutTools.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemReadoutTools.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.machine.TileEntityGenerator; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -24,8 +26,6 @@ import universalelectricity.api.energy.UnitDisplay.Unit; import buildcraft.api.power.IPowerReceptor; import cofh.api.energy.IEnergyStorage; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.machine.TileEntityGenerator; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.interfaces.IToolReadOut; diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java b/src/main/java/resonantinduction/assemblyline/item/ItemWrench.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java rename to src/main/java/resonantinduction/assemblyline/item/ItemWrench.java index 8ff41afa9..3bf2ea3a7 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java +++ b/src/main/java/resonantinduction/assemblyline/item/ItemWrench.java @@ -1,5 +1,6 @@ -package com.builtbroken.assemblyline.item; +package resonantinduction.assemblyline.item; +import resonantinduction.assemblyline.AssemblyLine; import ic2.api.tile.IWrenchable; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -13,7 +14,6 @@ import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.vector.Vector3; import buildcraft.api.tools.IToolWrench; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.IExtraInfo.IExtraItemInfo; import com.builtbroken.minecraft.helpers.HelperMethods; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockApertureExcavator.java b/src/main/java/resonantinduction/assemblyline/machine/BlockApertureExcavator.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockApertureExcavator.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockApertureExcavator.java index f2584a486..b9df703c2 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockApertureExcavator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockApertureExcavator.java @@ -1,12 +1,12 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockCrate.java b/src/main/java/resonantinduction/assemblyline/machine/BlockCrate.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockCrate.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockCrate.java index cecf77917..a8f32e285 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockCrate.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockCrate.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockAssembly; +import resonantinduction.assemblyline.client.render.RenderCrate; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -17,9 +20,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockAssembly; -import com.builtbroken.assemblyline.client.render.RenderCrate; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockDebug.java b/src/main/java/resonantinduction/assemblyline/machine/BlockDebug.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockDebug.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockDebug.java index 4813b226d..e7ed23ebe 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockDebug.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockDebug.java @@ -1,8 +1,10 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -13,8 +15,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockDetector.java b/src/main/java/resonantinduction/assemblyline/machine/BlockDetector.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockDetector.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockDetector.java index 1048f01b7..34df0d71b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockDetector.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockDetector.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.render.RenderDetector; +import resonantinduction.assemblyline.imprinter.prefab.BlockImprintable; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.EntityLivingBase; @@ -16,9 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.render.RenderDetector; -import com.builtbroken.assemblyline.imprinter.prefab.BlockImprintable; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java b/src/main/java/resonantinduction/assemblyline/machine/BlockEnergyStorage.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockEnergyStorage.java index 042ba8b58..d564d398b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockEnergyStorage.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.CommonProxy; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,9 +19,6 @@ import universalelectricity.api.UniversalElectricity; import universalelectricity.api.energy.IConductor; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.CommonProxy; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.helpers.HelperMethods; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockFracker.java b/src/main/java/resonantinduction/assemblyline/machine/BlockFracker.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockFracker.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockFracker.java index b7eacc142..9f2bcd185 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockFracker.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockFracker.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockFrackingPipe.java b/src/main/java/resonantinduction/assemblyline/machine/BlockFrackingPipe.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockFrackingPipe.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockFrackingPipe.java index 80c67fb14..8f5430ad2 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockFrackingPipe.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockFrackingPipe.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockLaserDrill.java b/src/main/java/resonantinduction/assemblyline/machine/BlockLaserDrill.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockLaserDrill.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockLaserDrill.java index 4bc61592c..ece8b0d3f 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockLaserDrill.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockLaserDrill.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockManipulator.java b/src/main/java/resonantinduction/assemblyline/machine/BlockManipulator.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockManipulator.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockManipulator.java index 0127b6888..e76e86bd5 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockManipulator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockManipulator.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderManipulator; +import resonantinduction.assemblyline.imprinter.prefab.BlockImprintable; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -11,9 +14,6 @@ import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderManipulator; -import com.builtbroken.assemblyline.imprinter.prefab.BlockImprintable; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockMapUtil.java b/src/main/java/resonantinduction/assemblyline/machine/BlockMapUtil.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockMapUtil.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockMapUtil.java index 61826414c..10261e9bf 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockMapUtil.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockMapUtil.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java b/src/main/java/resonantinduction/assemblyline/machine/BlockMechanicalGenerator.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockMechanicalGenerator.java index d01c81100..fddd1746c 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockMechanicalGenerator.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -12,9 +15,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockMiningLaser.java b/src/main/java/resonantinduction/assemblyline/machine/BlockMiningLaser.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockMiningLaser.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockMiningLaser.java index 7a1585dee..e292030ae 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockMiningLaser.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockMiningLaser.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockRejector.java b/src/main/java/resonantinduction/assemblyline/machine/BlockRejector.java similarity index 86% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockRejector.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockRejector.java index b52802b4b..d824f6e98 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockRejector.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockRejector.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderRejector; +import resonantinduction.assemblyline.imprinter.prefab.BlockImprintable; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -10,10 +14,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderRejector; -import com.builtbroken.assemblyline.imprinter.prefab.BlockImprintable; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockReleaseValve.java b/src/main/java/resonantinduction/assemblyline/machine/BlockReleaseValve.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockReleaseValve.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockReleaseValve.java index 54e93a871..cb733f7c1 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockReleaseValve.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockReleaseValve.java @@ -1,8 +1,10 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Random; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.blocks.BlockHydraulic; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -10,8 +12,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockRod.java b/src/main/java/resonantinduction/assemblyline/machine/BlockRod.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockRod.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockRod.java index cda810df2..a004ca2b2 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockRod.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockRod.java @@ -1,7 +1,10 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -12,9 +15,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockScanner.java b/src/main/java/resonantinduction/assemblyline/machine/BlockScanner.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockScanner.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockScanner.java index 85453d429..21b1e4456 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockScanner.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockScanner.java @@ -1,12 +1,12 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockSink.java b/src/main/java/resonantinduction/assemblyline/machine/BlockSink.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockSink.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockSink.java index e994639a2..06bb97969 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockSink.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockSink.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Set; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -11,8 +13,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.prefab.TileEntityAdvanced; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockSteamPiston.java b/src/main/java/resonantinduction/assemblyline/machine/BlockSteamPiston.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockSteamPiston.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockSteamPiston.java index a782a43f8..40be459cc 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockSteamPiston.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockSteamPiston.java @@ -1,15 +1,15 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Random; import java.util.Set; +import resonantinduction.assemblyline.blocks.BlockHydraulic; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockTank.java b/src/main/java/resonantinduction/assemblyline/machine/BlockTank.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockTank.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockTank.java index 01f8d9384..0b5ae3080 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockTank.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockTank.java @@ -1,9 +1,14 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.blocks.BlockHydraulic; +import resonantinduction.assemblyline.client.render.BlockRenderHelper; +import resonantinduction.assemblyline.fluid.pipes.FluidPartsMaterial; +import resonantinduction.assemblyline.fluid.pipes.ItemBlockPipe; +import resonantinduction.assemblyline.fluid.pipes.TileEntityPipe; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,11 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.blocks.BlockHydraulic; -import com.builtbroken.assemblyline.client.render.BlockRenderHelper; -import com.builtbroken.assemblyline.fluid.pipes.FluidPartsMaterial; -import com.builtbroken.assemblyline.fluid.pipes.ItemBlockPipe; -import com.builtbroken.assemblyline.fluid.pipes.TileEntityPipe; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.helpers.HelperMethods; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockTransformer.java b/src/main/java/resonantinduction/assemblyline/machine/BlockTransformer.java similarity index 76% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockTransformer.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockTransformer.java index 38983cc82..bd067f355 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockTransformer.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockTransformer.java @@ -1,11 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.block.material.Material; import net.minecraftforge.common.Configuration; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.minecraft.prefab.BlockMachine; public class BlockTransformer extends BlockMachine diff --git a/src/main/java/com/builtbroken/assemblyline/machine/BlockTurntable.java b/src/main/java/resonantinduction/assemblyline/machine/BlockTurntable.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/BlockTurntable.java rename to src/main/java/resonantinduction/assemblyline/machine/BlockTurntable.java index bde299a29..192486654 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/BlockTurntable.java +++ b/src/main/java/resonantinduction/assemblyline/machine/BlockTurntable.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.Random; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.blocks.BlockAssembly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -15,8 +17,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.blocks.BlockAssembly; import com.builtbroken.minecraft.interfaces.IRotatable; import com.builtbroken.minecraft.interfaces.IRotatableBlock; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java b/src/main/java/resonantinduction/assemblyline/machine/ContainerBatteryBox.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java rename to src/main/java/resonantinduction/assemblyline/machine/ContainerBatteryBox.java index 78a761fb4..3646724d8 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ContainerBatteryBox.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ContainerFilter.java b/src/main/java/resonantinduction/assemblyline/machine/ContainerFilter.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/ContainerFilter.java rename to src/main/java/resonantinduction/assemblyline/machine/ContainerFilter.java index b878226c1..a1bba9d14 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ContainerFilter.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ContainerFilter.java @@ -1,5 +1,6 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -7,8 +8,6 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; - public class ContainerFilter extends Container { private TileEntityFilterable tileEntity; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ContainerScanner.java b/src/main/java/resonantinduction/assemblyline/machine/ContainerScanner.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/ContainerScanner.java rename to src/main/java/resonantinduction/assemblyline/machine/ContainerScanner.java index 7e01cc35a..e9db8ba30 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ContainerScanner.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ContainerScanner.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/InventoryCrate.java b/src/main/java/resonantinduction/assemblyline/machine/InventoryCrate.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/InventoryCrate.java rename to src/main/java/resonantinduction/assemblyline/machine/InventoryCrate.java index 5d9c68bc4..d88f26d4b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/InventoryCrate.java +++ b/src/main/java/resonantinduction/assemblyline/machine/InventoryCrate.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockCrate.java b/src/main/java/resonantinduction/assemblyline/machine/ItemBlockCrate.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/machine/ItemBlockCrate.java rename to src/main/java/resonantinduction/assemblyline/machine/ItemBlockCrate.java index a694acda5..74f65af52 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockCrate.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ItemBlockCrate.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java b/src/main/java/resonantinduction/assemblyline/machine/ItemBlockEnergyStorage.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java rename to src/main/java/resonantinduction/assemblyline/machine/ItemBlockEnergyStorage.java index 763fc8222..137a0c1b5 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ItemBlockEnergyStorage.java @@ -1,7 +1,8 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -15,8 +16,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.ALRecipeLoader; - /** Item version of the enrgy storage block * * @author Darkguardsman */ diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java b/src/main/java/resonantinduction/assemblyline/machine/ItemFluidCan.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java rename to src/main/java/resonantinduction/assemblyline/machine/ItemFluidCan.java index 1b8a9ba38..e7d05c6d2 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ItemFluidCan.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,8 +14,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.ItemFluidContainer; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; import com.builtbroken.minecraft.DarkCore; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/ItemStorageCan.java b/src/main/java/resonantinduction/assemblyline/machine/ItemStorageCan.java similarity index 74% rename from src/main/java/com/builtbroken/assemblyline/machine/ItemStorageCan.java rename to src/main/java/resonantinduction/assemblyline/machine/ItemStorageCan.java index 8776dd0ff..53f2ba2d9 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/ItemStorageCan.java +++ b/src/main/java/resonantinduction/assemblyline/machine/ItemStorageCan.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; /** Can that is used to store items such as food, parts, or solid fuels. * diff --git a/src/main/java/com/builtbroken/assemblyline/machine/NetworkAssembly.java b/src/main/java/resonantinduction/assemblyline/machine/NetworkAssembly.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/NetworkAssembly.java rename to src/main/java/resonantinduction/assemblyline/machine/NetworkAssembly.java index dd3a75c04..a27c688c1 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/NetworkAssembly.java +++ b/src/main/java/resonantinduction/assemblyline/machine/NetworkAssembly.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.prefab.NetworkSharedPower; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/PathfinderCrate.java b/src/main/java/resonantinduction/assemblyline/machine/PathfinderCrate.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/PathfinderCrate.java rename to src/main/java/resonantinduction/assemblyline/machine/PathfinderCrate.java index fceefce97..4e64dba81 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/PathfinderCrate.java +++ b/src/main/java/resonantinduction/assemblyline/machine/PathfinderCrate.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java b/src/main/java/resonantinduction/assemblyline/machine/TileApertureExcavator.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java rename to src/main/java/resonantinduction/assemblyline/machine/TileApertureExcavator.java index ef6cca7a2..bcd0e35c8 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileApertureExcavator.java @@ -1,14 +1,14 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.api.MachineMiningEvent; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.api.MachineMiningEvent; import com.builtbroken.minecraft.helpers.InvInteractionHelper; import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityAssembly.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityAssembly.java index 5d3e3724c..7786400da 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityAssembly.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityBatteryBox.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityBatteryBox.java index 2846cb716..2c4d7351c 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityBatteryBox.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.EnumSet; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityCrate.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityCrate.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityCrate.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityCrate.java index 9bc7438c3..99b9b2b39 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityCrate.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityCrate.java @@ -1,13 +1,13 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.network.ISimplePacketReceiver; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.network.ISimplePacketReceiver; import com.builtbroken.minecraft.interfaces.IExtendedStorage; import com.builtbroken.minecraft.prefab.TileEntityInv; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityDetector.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityDetector.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityDetector.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityDetector.java index 9d1c88a2c..bf4350717 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityDetector.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityDetector.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -11,8 +13,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityGenerator.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityGenerator.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityGenerator.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityGenerator.java index 60b74e583..89b36cb24 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityGenerator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityGenerator.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfFluid.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityInfFluid.java index 1353ef59d..ca9d3cc86 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfFluid.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfLoad.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityInfLoad.java index 37348bedb..ccba6dd66 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfLoad.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfSupply.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityInfSupply.java index aac917e28..e9ef2845d 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityInfSupply.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.EnumSet; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityManipulator.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityManipulator.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityManipulator.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityManipulator.java index 2be28ee5a..a7a292dc5 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityManipulator.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityManipulator.java @@ -1,7 +1,10 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; +import resonantinduction.assemblyline.api.IManipulator; +import resonantinduction.assemblyline.imprinter.ItemImprinter; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -11,9 +14,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.api.IManipulator; -import com.builtbroken.assemblyline.imprinter.ItemImprinter; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; import com.builtbroken.minecraft.helpers.InvInteractionHelper; import com.builtbroken.minecraft.interfaces.IRotatable; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityRejector.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityRejector.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityRejector.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityRejector.java index febcedfec..82dcd3f49 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityRejector.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityRejector.java @@ -1,7 +1,9 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.List; +import resonantinduction.assemblyline.api.IBelt; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -12,8 +14,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.api.IBelt; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityReleaseValve.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityReleaseValve.java index 6c9126234..30888358b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityReleaseValve.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.api.fluid.INetworkPipe; +import resonantinduction.assemblyline.fluid.network.NetworkPipes; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidDevice; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -7,9 +10,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.api.fluid.INetworkPipe; -import com.builtbroken.assemblyline.fluid.network.NetworkPipes; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidDevice; import com.builtbroken.minecraft.helpers.HelperMethods; import com.builtbroken.minecraft.interfaces.IToolReadOut; import com.builtbroken.minecraft.tilenetwork.ITileConnector; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySink.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntitySink.java similarity index 92% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntitySink.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntitySink.java index e39d696e0..87d9b95dc 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySink.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntitySink.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidStorage; +import resonantinduction.assemblyline.network.ISimplePacketReceiver; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraftforge.common.ForgeDirection; @@ -9,9 +12,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidStorage; -import com.builtbroken.assemblyline.network.ISimplePacketReceiver; import com.builtbroken.minecraft.helpers.ColorCode; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntitySteamPiston.java similarity index 74% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntitySteamPiston.java index f6a655147..b99703267 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntitySteamPiston.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityTank.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityTank.java similarity index 84% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityTank.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityTank.java index 3871e21d9..4f4e3271b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityTank.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityTank.java @@ -1,11 +1,11 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.api.fluid.INetworkFluidPart; +import resonantinduction.assemblyline.fluid.network.NetworkFluidContainers; +import resonantinduction.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import com.builtbroken.assemblyline.api.fluid.INetworkFluidPart; -import com.builtbroken.assemblyline.fluid.network.NetworkFluidContainers; -import com.builtbroken.assemblyline.fluid.prefab.TileEntityFluidNetworkTile; import com.builtbroken.minecraft.tilenetwork.INetworkPart; import com.builtbroken.minecraft.tilenetwork.ITileNetwork; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityVoid.java b/src/main/java/resonantinduction/assemblyline/machine/TileEntityVoid.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/TileEntityVoid.java rename to src/main/java/resonantinduction/assemblyline/machine/TileEntityVoid.java index 313f39ece..082a4a20e 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileEntityVoid.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileEntityVoid.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java b/src/main/java/resonantinduction/assemblyline/machine/TileFracker.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java rename to src/main/java/resonantinduction/assemblyline/machine/TileFracker.java index 7b67af72a..276f63dcc 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileFracker.java @@ -1,5 +1,8 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.fluid.EnumGas; +import resonantinduction.assemblyline.fluid.GasTank; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; @@ -10,9 +13,6 @@ import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.fluid.EnumGas; -import com.builtbroken.assemblyline.fluid.GasTank; import com.builtbroken.minecraft.FluidHelper; import com.builtbroken.minecraft.interfaces.IBlockActivated; import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java b/src/main/java/resonantinduction/assemblyline/machine/TileFrackingPipe.java similarity index 72% rename from src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java rename to src/main/java/resonantinduction/assemblyline/machine/TileFrackingPipe.java index 55b82b9cc..e0e144d64 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileFrackingPipe.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java b/src/main/java/resonantinduction/assemblyline/machine/TileGasBurner.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java rename to src/main/java/resonantinduction/assemblyline/machine/TileGasBurner.java index 981419f5d..020946ab7 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileGasBurner.java @@ -1,12 +1,12 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.fluid.GasTank; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.fluid.GasTank; import com.builtbroken.minecraft.prefab.TileEntityMachine; /** @author Archadia */ diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileGasCombustionEngine.java b/src/main/java/resonantinduction/assemblyline/machine/TileGasCombustionEngine.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/machine/TileGasCombustionEngine.java rename to src/main/java/resonantinduction/assemblyline/machine/TileGasCombustionEngine.java index d66686ef6..b82cbd3bf 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileGasCombustionEngine.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileGasCombustionEngine.java @@ -1,5 +1,7 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; +import resonantinduction.assemblyline.fluid.EnumGas; +import resonantinduction.assemblyline.fluid.GasTank; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -8,8 +10,6 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.builtbroken.assemblyline.fluid.EnumGas; -import com.builtbroken.assemblyline.fluid.GasTank; import com.builtbroken.minecraft.prefab.TileEntityAdvanced; import com.builtbroken.minecraft.tilenetwork.ITileConnector.Connection; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileLaserDrill.java b/src/main/java/resonantinduction/assemblyline/machine/TileLaserDrill.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/machine/TileLaserDrill.java rename to src/main/java/resonantinduction/assemblyline/machine/TileLaserDrill.java index 87841be00..74588e713 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileLaserDrill.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileLaserDrill.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.awt.Color; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileLaserSentry.java b/src/main/java/resonantinduction/assemblyline/machine/TileLaserSentry.java similarity index 99% rename from src/main/java/com/builtbroken/assemblyline/machine/TileLaserSentry.java rename to src/main/java/resonantinduction/assemblyline/machine/TileLaserSentry.java index ccac4fe73..480334ada 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileLaserSentry.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileLaserSentry.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.awt.Color; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileScanner.java b/src/main/java/resonantinduction/assemblyline/machine/TileScanner.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/TileScanner.java rename to src/main/java/resonantinduction/assemblyline/machine/TileScanner.java index aa68561fe..3dfb35320 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileScanner.java +++ b/src/main/java/resonantinduction/assemblyline/machine/TileScanner.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine; +package resonantinduction.assemblyline.machine; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java b/src/main/java/resonantinduction/assemblyline/machine/belt/BlockConveyorBelt.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java rename to src/main/java/resonantinduction/assemblyline/machine/belt/BlockConveyorBelt.java index cb442b8bc..1bae6dd04 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java +++ b/src/main/java/resonantinduction/assemblyline/machine/belt/BlockConveyorBelt.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.machine.belt; +package resonantinduction.assemblyline.machine.belt; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.blocks.BlockAssembly; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderConveyorBelt; +import resonantinduction.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -18,10 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.blocks.BlockAssembly; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderConveyorBelt; -import com.builtbroken.assemblyline.machine.belt.TileEntityConveyorBelt.SlantType; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/main/java/resonantinduction/assemblyline/machine/belt/TileEntityConveyorBelt.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java rename to src/main/java/resonantinduction/assemblyline/machine/belt/TileEntityConveyorBelt.java index 52f0df3aa..8f45681fe 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java +++ b/src/main/java/resonantinduction/assemblyline/machine/belt/TileEntityConveyorBelt.java @@ -1,9 +1,12 @@ -package com.builtbroken.assemblyline.machine.belt; +package resonantinduction.assemblyline.machine.belt; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.api.IBelt; +import resonantinduction.assemblyline.machine.TileEntityAssembly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; @@ -13,9 +16,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.api.IBelt; -import com.builtbroken.assemblyline.machine.TileEntityAssembly; import com.builtbroken.minecraft.interfaces.IRotatable; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/BlockEncoder.java similarity index 91% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/BlockEncoder.java index 43640f9cf..999bbd60e 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/BlockEncoder.java @@ -1,7 +1,10 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.CommonProxy; +import resonantinduction.assemblyline.blocks.BlockAssembly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -10,9 +13,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.CommonProxy; -import com.builtbroken.assemblyline.blocks.BlockAssembly; import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/ContainerEncoder.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/ContainerEncoder.java index 1d62c52b6..c7425b6e9 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/ContainerEncoder.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/IInventoryWatcher.java similarity index 57% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/IInventoryWatcher.java index 1e2243b3c..142bc505a 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/IInventoryWatcher.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; public interface IInventoryWatcher { diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/ItemDisk.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/ItemDisk.java index df0436fe8..0ed7595a1 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/ItemDisk.java @@ -1,18 +1,16 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; import java.util.ArrayList; import java.util.List; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; - -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDisk.java similarity index 80% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDisk.java index cdafe5651..b84d51e7b 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDisk.java @@ -1,11 +1,10 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.builtbroken.assemblyline.ALRecipeLoader; - public class SlotDisk extends Slot { diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDiskResult.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDiskResult.java index 73c6cd1b0..c0d89a066 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/SlotDiskResult.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java b/src/main/java/resonantinduction/assemblyline/machine/encoder/TileEntityEncoder.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java rename to src/main/java/resonantinduction/assemblyline/machine/encoder/TileEntityEncoder.java index b5e74ab69..e0740410f 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java +++ b/src/main/java/resonantinduction/assemblyline/machine/encoder/TileEntityEncoder.java @@ -1,7 +1,13 @@ -package com.builtbroken.assemblyline.machine.encoder; +package resonantinduction.assemblyline.machine.encoder; import java.io.IOException; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.api.coding.IProgram; +import resonantinduction.assemblyline.api.coding.ITask; +import resonantinduction.assemblyline.api.coding.TaskRegistry; +import resonantinduction.assemblyline.armbot.Program; +import resonantinduction.assemblyline.armbot.command.TaskRotateTo; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -10,12 +16,6 @@ import net.minecraft.network.packet.Packet; import universalelectricity.api.vector.Vector2; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.api.coding.IProgram; -import com.builtbroken.assemblyline.api.coding.ITask; -import com.builtbroken.assemblyline.api.coding.TaskRegistry; -import com.builtbroken.assemblyline.armbot.Program; -import com.builtbroken.assemblyline.armbot.command.TaskRotateTo; import com.builtbroken.minecraft.prefab.TileEntityMachine; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java b/src/main/java/resonantinduction/assemblyline/machine/processor/BlockProcessor.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java rename to src/main/java/resonantinduction/assemblyline/machine/processor/BlockProcessor.java index 563fd23bd..51c29e977 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java +++ b/src/main/java/resonantinduction/assemblyline/machine/processor/BlockProcessor.java @@ -1,8 +1,13 @@ -package com.builtbroken.assemblyline.machine.processor; +package resonantinduction.assemblyline.machine.processor; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.CommonProxy; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.client.render.BlockRenderingHandler; +import resonantinduction.assemblyline.client.render.RenderProcessor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,11 +20,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.UniversalElectricity; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.CommonProxy; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.client.render.BlockRenderingHandler; -import com.builtbroken.assemblyline.client.render.RenderProcessor; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; import com.builtbroken.minecraft.recipes.ProcessorType; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java b/src/main/java/resonantinduction/assemblyline/machine/processor/ContainerProcessor.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java rename to src/main/java/resonantinduction/assemblyline/machine/processor/ContainerProcessor.java index 70607b8dc..587383654 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java +++ b/src/main/java/resonantinduction/assemblyline/machine/processor/ContainerProcessor.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.machine.processor; +package resonantinduction.assemblyline.machine.processor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java b/src/main/java/resonantinduction/assemblyline/machine/processor/TileEntityProcessor.java similarity index 98% rename from src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java rename to src/main/java/resonantinduction/assemblyline/machine/processor/TileEntityProcessor.java index 44cd90df0..e0a7570c3 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java +++ b/src/main/java/resonantinduction/assemblyline/machine/processor/TileEntityProcessor.java @@ -1,5 +1,6 @@ -package com.builtbroken.assemblyline.machine.processor; +package resonantinduction.assemblyline.machine.processor; +import resonantinduction.assemblyline.machine.processor.BlockProcessor.ProcessorData; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; @@ -7,7 +8,6 @@ import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.item.IEnergyItem; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.machine.processor.BlockProcessor.ProcessorData; import com.builtbroken.minecraft.interfaces.IInvBox; import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine; import com.builtbroken.minecraft.prefab.invgui.InvChest; diff --git a/src/main/java/com/builtbroken/assemblyline/network/ISimplePacketReceiver.java b/src/main/java/resonantinduction/assemblyline/network/ISimplePacketReceiver.java similarity index 93% rename from src/main/java/com/builtbroken/assemblyline/network/ISimplePacketReceiver.java rename to src/main/java/resonantinduction/assemblyline/network/ISimplePacketReceiver.java index 84fe8ed80..413ceb7f6 100644 --- a/src/main/java/com/builtbroken/assemblyline/network/ISimplePacketReceiver.java +++ b/src/main/java/resonantinduction/assemblyline/network/ISimplePacketReceiver.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.network; +package resonantinduction.assemblyline.network; import com.google.common.io.ByteArrayDataInput; diff --git a/src/main/java/com/builtbroken/assemblyline/network/PacketIDTile.java b/src/main/java/resonantinduction/assemblyline/network/PacketIDTile.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/network/PacketIDTile.java rename to src/main/java/resonantinduction/assemblyline/network/PacketIDTile.java index 08fcdf71f..3401b38b7 100644 --- a/src/main/java/com/builtbroken/assemblyline/network/PacketIDTile.java +++ b/src/main/java/resonantinduction/assemblyline/network/PacketIDTile.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.network; +package resonantinduction.assemblyline.network; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/builtbroken/assemblyline/redstone/BlockAdvancedHopper.java b/src/main/java/resonantinduction/assemblyline/redstone/BlockAdvancedHopper.java similarity index 95% rename from src/main/java/com/builtbroken/assemblyline/redstone/BlockAdvancedHopper.java rename to src/main/java/resonantinduction/assemblyline/redstone/BlockAdvancedHopper.java index da56f974d..44c62a1cd 100644 --- a/src/main/java/com/builtbroken/assemblyline/redstone/BlockAdvancedHopper.java +++ b/src/main/java/resonantinduction/assemblyline/redstone/BlockAdvancedHopper.java @@ -1,8 +1,11 @@ -package com.builtbroken.assemblyline.redstone; +package resonantinduction.assemblyline.redstone; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.client.render.RenderAdvancedHopper; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -14,9 +17,6 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.client.render.RenderAdvancedHopper; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/redstone/BlockPistonPlus.java b/src/main/java/resonantinduction/assemblyline/redstone/BlockPistonPlus.java similarity index 79% rename from src/main/java/com/builtbroken/assemblyline/redstone/BlockPistonPlus.java rename to src/main/java/resonantinduction/assemblyline/redstone/BlockPistonPlus.java index f6f0f7b4a..cc2147acd 100644 --- a/src/main/java/com/builtbroken/assemblyline/redstone/BlockPistonPlus.java +++ b/src/main/java/resonantinduction/assemblyline/redstone/BlockPistonPlus.java @@ -1,8 +1,8 @@ -package com.builtbroken.assemblyline.redstone; +package resonantinduction.assemblyline.redstone; +import resonantinduction.assemblyline.AssemblyLine; import net.minecraft.block.material.Material; -import com.builtbroken.assemblyline.AssemblyLine; import com.builtbroken.minecraft.prefab.BlockMachine; /** This will be a piston that can extend from 1 - 20 depending on teir and user settings diff --git a/src/main/java/com/builtbroken/assemblyline/redstone/TileEntityAdvancedHopper.java b/src/main/java/resonantinduction/assemblyline/redstone/TileEntityAdvancedHopper.java similarity index 96% rename from src/main/java/com/builtbroken/assemblyline/redstone/TileEntityAdvancedHopper.java rename to src/main/java/resonantinduction/assemblyline/redstone/TileEntityAdvancedHopper.java index 03e034532..eb83e2a27 100644 --- a/src/main/java/com/builtbroken/assemblyline/redstone/TileEntityAdvancedHopper.java +++ b/src/main/java/resonantinduction/assemblyline/redstone/TileEntityAdvancedHopper.java @@ -1,15 +1,15 @@ -package com.builtbroken.assemblyline.redstone; +package resonantinduction.assemblyline.redstone; import java.util.List; +import resonantinduction.assemblyline.imprinter.ItemImprinter; +import resonantinduction.assemblyline.imprinter.prefab.TileEntityFilterable; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.imprinter.ItemImprinter; -import com.builtbroken.assemblyline.imprinter.prefab.TileEntityFilterable; import com.builtbroken.minecraft.helpers.HelperMethods; import com.builtbroken.minecraft.helpers.InvInteractionHelper; diff --git a/src/main/java/com/builtbroken/assemblyline/redstone/TileEntityPistonPlus.java b/src/main/java/resonantinduction/assemblyline/redstone/TileEntityPistonPlus.java similarity index 90% rename from src/main/java/com/builtbroken/assemblyline/redstone/TileEntityPistonPlus.java rename to src/main/java/resonantinduction/assemblyline/redstone/TileEntityPistonPlus.java index 420f441c5..0c3280368 100644 --- a/src/main/java/com/builtbroken/assemblyline/redstone/TileEntityPistonPlus.java +++ b/src/main/java/resonantinduction/assemblyline/redstone/TileEntityPistonPlus.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.redstone; +package resonantinduction.assemblyline.redstone; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/BlockWire.java b/src/main/java/resonantinduction/assemblyline/transmit/BlockWire.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/transmit/BlockWire.java rename to src/main/java/resonantinduction/assemblyline/transmit/BlockWire.java index bfde1de2e..21d5b7628 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/BlockWire.java +++ b/src/main/java/resonantinduction/assemblyline/transmit/BlockWire.java @@ -1,8 +1,12 @@ -package com.builtbroken.assemblyline.transmit; +package resonantinduction.assemblyline.transmit; import java.util.List; import java.util.Set; +import resonantinduction.assemblyline.ALRecipeLoader; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.IndustryTabs; +import resonantinduction.assemblyline.client.render.RenderBlockWire; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -18,10 +22,6 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.oredict.OreDictionary; import universalelectricity.api.vector.Vector3; -import com.builtbroken.assemblyline.ALRecipeLoader; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.IndustryTabs; -import com.builtbroken.assemblyline.client.render.RenderBlockWire; import com.builtbroken.common.Pair; import com.builtbroken.minecraft.prefab.BlockMachine; diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/ItemBlockWire.java b/src/main/java/resonantinduction/assemblyline/transmit/ItemBlockWire.java similarity index 81% rename from src/main/java/com/builtbroken/assemblyline/transmit/ItemBlockWire.java rename to src/main/java/resonantinduction/assemblyline/transmit/ItemBlockWire.java index c6c39ea72..2f761f617 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/ItemBlockWire.java +++ b/src/main/java/resonantinduction/assemblyline/transmit/ItemBlockWire.java @@ -1,8 +1,8 @@ -package com.builtbroken.assemblyline.transmit; +package resonantinduction.assemblyline.transmit; +import resonantinduction.assemblyline.ALRecipeLoader; import net.minecraft.util.Icon; -import com.builtbroken.assemblyline.ALRecipeLoader; import com.builtbroken.minecraft.prefab.ItemBlockHolder; public class ItemBlockWire extends ItemBlockHolder diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java b/src/main/java/resonantinduction/assemblyline/transmit/TileEntityDetectorWire.java similarity index 89% rename from src/main/java/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java rename to src/main/java/resonantinduction/assemblyline/transmit/TileEntityDetectorWire.java index 23acdaf0c..dc5596980 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java +++ b/src/main/java/resonantinduction/assemblyline/transmit/TileEntityDetectorWire.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.transmit; +package resonantinduction.assemblyline.transmit; public class TileEntityDetectorWire extends TileEntityWire { diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java b/src/main/java/resonantinduction/assemblyline/transmit/TileEntitySwitchWire.java similarity index 94% rename from src/main/java/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java rename to src/main/java/resonantinduction/assemblyline/transmit/TileEntitySwitchWire.java index 41a39e29f..4d9f03e54 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java +++ b/src/main/java/resonantinduction/assemblyline/transmit/TileEntitySwitchWire.java @@ -1,4 +1,4 @@ -package com.builtbroken.assemblyline.transmit; +package resonantinduction.assemblyline.transmit; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java b/src/main/java/resonantinduction/assemblyline/transmit/TileEntityWire.java similarity index 97% rename from src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java rename to src/main/java/resonantinduction/assemblyline/transmit/TileEntityWire.java index 641c76c7e..fb8b9fea4 100644 --- a/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java +++ b/src/main/java/resonantinduction/assemblyline/transmit/TileEntityWire.java @@ -1,5 +1,7 @@ -package com.builtbroken.assemblyline.transmit; +package resonantinduction.assemblyline.transmit; +import resonantinduction.assemblyline.AssemblyLine; +import resonantinduction.assemblyline.network.ISimplePacketReceiver; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; @@ -14,8 +16,6 @@ import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; import calclavia.lib.network.PacketHandler; -import com.builtbroken.assemblyline.AssemblyLine; -import com.builtbroken.assemblyline.network.ISimplePacketReceiver; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded; import com.builtbroken.minecraft.prefab.TileEntityAdvanced;