diff --git a/build.properties b/build.properties index 0a14c6d15..0a112e7ba 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ dir.development=./ dir.mcp=${dir.development}forge/mcp -version.minecraft=1.6.2 +version.minecraft=1.6.4 version.mod.major=0 -version.mod.minor=3 -version.mod.revis=5 +version.mod.minor=5 +version.mod.revis=0 diff --git a/dependancies.info b/dependancies.info deleted file mode 100644 index 7542d102e..000000000 --- a/dependancies.info +++ /dev/null @@ -1,8 +0,0 @@ -{ - "repo": "http://files.minecraftforge.net/ForgeMultipart/", - "file": "ForgeMultipart-universal-@MCVERSION@-@VERSION@.jar", - "dev": "ForgeMultipart-dev-@MCVERSION@-@VERSION@.jar", - "class": "codechicken.multipart.MultipartMod", - "version": "1.0.0.182", - "mcversion": "1.6.4" -} \ No newline at end of file diff --git a/dependencies.xml b/dependencies.xml deleted file mode 100644 index ae9c882b9..000000000 --- a/dependencies.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/B1iB0DI.png b/project/docs/B1iB0DI.png similarity index 100% rename from docs/B1iB0DI.png rename to project/docs/B1iB0DI.png diff --git a/docs/BeltItemFluidFiller.txt b/project/docs/BeltItemFluidFiller.txt similarity index 100% rename from docs/BeltItemFluidFiller.txt rename to project/docs/BeltItemFluidFiller.txt diff --git a/docs/BeltRework.txt b/project/docs/BeltRework.txt similarity index 100% rename from docs/BeltRework.txt rename to project/docs/BeltRework.txt diff --git a/docs/BoilerSystemDesign.png b/project/docs/BoilerSystemDesign.png similarity index 100% rename from docs/BoilerSystemDesign.png rename to project/docs/BoilerSystemDesign.png diff --git a/docs/DNA.txt b/project/docs/DNA.txt similarity index 100% rename from docs/DNA.txt rename to project/docs/DNA.txt diff --git a/docs/FarmTechIdeasFromLiQuiD.txt b/project/docs/FarmTechIdeasFromLiQuiD.txt similarity index 100% rename from docs/FarmTechIdeasFromLiQuiD.txt rename to project/docs/FarmTechIdeasFromLiQuiD.txt diff --git a/docs/FishFinder.txt b/project/docs/FishFinder.txt similarity index 100% rename from docs/FishFinder.txt rename to project/docs/FishFinder.txt diff --git a/docs/HRSG_FLOW-DIAGRAM.jpg b/project/docs/HRSG_FLOW-DIAGRAM.jpg similarity index 100% rename from docs/HRSG_FLOW-DIAGRAM.jpg rename to project/docs/HRSG_FLOW-DIAGRAM.jpg diff --git a/docs/Hardnesses of the elements (data page) - Wikipedia, the free encyclopedia.url b/project/docs/Hardnesses of the elements (data page) - Wikipedia, the free encyclopedia.url similarity index 100% rename from docs/Hardnesses of the elements (data page) - Wikipedia, the free encyclopedia.url rename to project/docs/Hardnesses of the elements (data page) - Wikipedia, the free encyclopedia.url diff --git a/docs/HeatingSystem.txt b/project/docs/HeatingSystem.txt similarity index 100% rename from docs/HeatingSystem.txt rename to project/docs/HeatingSystem.txt diff --git a/docs/Hopper2.0.txt b/project/docs/Hopper2.0.txt similarity index 100% rename from docs/Hopper2.0.txt rename to project/docs/Hopper2.0.txt diff --git a/docs/Hydroelectric_dam.svg.png b/project/docs/Hydroelectric_dam.svg.png similarity index 100% rename from docs/Hydroelectric_dam.svg.png rename to project/docs/Hydroelectric_dam.svg.png diff --git a/docs/IMG_20130130_122914.jpg b/project/docs/IMG_20130130_122914.jpg similarity index 100% rename from docs/IMG_20130130_122914.jpg rename to project/docs/IMG_20130130_122914.jpg diff --git a/docs/IndustryQuotes.txt b/project/docs/IndustryQuotes.txt similarity index 100% rename from docs/IndustryQuotes.txt rename to project/docs/IndustryQuotes.txt diff --git a/docs/JHC-0803-lg.jpg b/project/docs/JHC-0803-lg.jpg similarity index 100% rename from docs/JHC-0803-lg.jpg rename to project/docs/JHC-0803-lg.jpg diff --git a/docs/Mohs scale of mineral hardness - Wikipedia, the free encyclopedia.url b/project/docs/Mohs scale of mineral hardness - Wikipedia, the free encyclopedia.url similarity index 100% rename from docs/Mohs scale of mineral hardness - Wikipedia, the free encyclopedia.url rename to project/docs/Mohs scale of mineral hardness - Wikipedia, the free encyclopedia.url diff --git a/docs/PLC and Displays.txt b/project/docs/PLC and Displays.txt similarity index 100% rename from docs/PLC and Displays.txt rename to project/docs/PLC and Displays.txt diff --git a/docs/Plan (2).txt b/project/docs/Plan (2).txt similarity index 100% rename from docs/Plan (2).txt rename to project/docs/Plan (2).txt diff --git a/docs/Plan.txt b/project/docs/Plan.txt similarity index 100% rename from docs/Plan.txt rename to project/docs/Plan.txt diff --git a/docs/TODO.txt b/project/docs/TODO.txt similarity index 100% rename from docs/TODO.txt rename to project/docs/TODO.txt diff --git a/docs/Turkey.txt b/project/docs/Turkey.txt similarity index 100% rename from docs/Turkey.txt rename to project/docs/Turkey.txt diff --git a/docs/Wires.txt b/project/docs/Wires.txt similarity index 100% rename from docs/Wires.txt rename to project/docs/Wires.txt diff --git a/docs/beer-production.jpg b/project/docs/beer-production.jpg similarity index 100% rename from docs/beer-production.jpg rename to project/docs/beer-production.jpg diff --git a/docs/big_warehousesmall.jpg b/project/docs/big_warehousesmall.jpg similarity index 100% rename from docs/big_warehousesmall.jpg rename to project/docs/big_warehousesmall.jpg diff --git a/docs/brewing-design/brewingDesign.png b/project/docs/brewing-design/brewingDesign.png similarity index 100% rename from docs/brewing-design/brewingDesign.png rename to project/docs/brewing-design/brewingDesign.png diff --git a/docs/brewing-design/img022.jpg b/project/docs/brewing-design/img022.jpg similarity index 100% rename from docs/brewing-design/img022.jpg rename to project/docs/brewing-design/img022.jpg diff --git a/docs/brewing-design/img023.jpg b/project/docs/brewing-design/img023.jpg similarity index 100% rename from docs/brewing-design/img023.jpg rename to project/docs/brewing-design/img023.jpg diff --git a/docs/crane/CraneDesign.png b/project/docs/crane/CraneDesign.png similarity index 100% rename from docs/crane/CraneDesign.png rename to project/docs/crane/CraneDesign.png diff --git a/docs/crane/CranePlan.png b/project/docs/crane/CranePlan.png similarity index 100% rename from docs/crane/CranePlan.png rename to project/docs/crane/CranePlan.png diff --git a/docs/crane/IMG_20130130_122922.jpg b/project/docs/crane/IMG_20130130_122922.jpg similarity index 100% rename from docs/crane/IMG_20130130_122922.jpg rename to project/docs/crane/IMG_20130130_122922.jpg diff --git a/docs/design (2).txt b/project/docs/design (2).txt similarity index 100% rename from docs/design (2).txt rename to project/docs/design (2).txt diff --git a/docs/design.txt b/project/docs/design.txt similarity index 100% rename from docs/design.txt rename to project/docs/design.txt diff --git a/docs/flowchart/7.jpg b/project/docs/flowchart/7.jpg similarity index 100% rename from docs/flowchart/7.jpg rename to project/docs/flowchart/7.jpg diff --git a/docs/flowchart/Flowchart Basics, Symbols and Flowcharting Best Practices.url b/project/docs/flowchart/Flowchart Basics, Symbols and Flowcharting Best Practices.url similarity index 100% rename from docs/flowchart/Flowchart Basics, Symbols and Flowcharting Best Practices.url rename to project/docs/flowchart/Flowchart Basics, Symbols and Flowcharting Best Practices.url diff --git a/docs/flowchart/Programmer.txt b/project/docs/flowchart/Programmer.txt similarity index 100% rename from docs/flowchart/Programmer.txt rename to project/docs/flowchart/Programmer.txt diff --git a/docs/flowchart/grafcet.gif b/project/docs/flowchart/grafcet.gif similarity index 100% rename from docs/flowchart/grafcet.gif rename to project/docs/flowchart/grafcet.gif diff --git a/docs/fraunhoferspider.jpg b/project/docs/fraunhoferspider.jpg similarity index 100% rename from docs/fraunhoferspider.jpg rename to project/docs/fraunhoferspider.jpg diff --git a/docs/growBox.txt b/project/docs/growBox.txt similarity index 100% rename from docs/growBox.txt rename to project/docs/growBox.txt diff --git a/docs/img025.jpg b/project/docs/img025.jpg similarity index 100% rename from docs/img025.jpg rename to project/docs/img025.jpg diff --git a/docs/lettucerobot.jpg b/project/docs/lettucerobot.jpg similarity index 100% rename from docs/lettucerobot.jpg rename to project/docs/lettucerobot.jpg diff --git a/docs/machines.txt b/project/docs/machines.txt similarity index 100% rename from docs/machines.txt rename to project/docs/machines.txt diff --git a/docs/steam-boiler-ft-a.gif b/project/docs/steam-boiler-ft-a.gif similarity index 100% rename from docs/steam-boiler-ft-a.gif rename to project/docs/steam-boiler-ft-a.gif diff --git a/docs/tanks.txt b/project/docs/tanks.txt similarity index 100% rename from docs/tanks.txt rename to project/docs/tanks.txt diff --git a/models/AdvancedHopper.tcn b/project/models/AdvancedHopper.tcn similarity index 100% rename from models/AdvancedHopper.tcn rename to project/models/AdvancedHopper.tcn diff --git a/models/Archive/BOILER TANK.tcn b/project/models/Archive/BOILER TANK.tcn similarity index 100% rename from models/Archive/BOILER TANK.tcn rename to project/models/Archive/BOILER TANK.tcn diff --git a/models/Archive/CornerTank.tcn b/project/models/Archive/CornerTank.tcn similarity index 100% rename from models/Archive/CornerTank.tcn rename to project/models/Archive/CornerTank.tcn diff --git a/models/Archive/Generator.tcn b/project/models/Archive/Generator.tcn similarity index 100% rename from models/Archive/Generator.tcn rename to project/models/Archive/Generator.tcn diff --git a/models/Archive/Pump.tcn b/project/models/Archive/Pump.tcn similarity index 100% rename from models/Archive/Pump.tcn rename to project/models/Archive/Pump.tcn diff --git a/models/Archive/STEAM ENGINE.tcn b/project/models/Archive/STEAM ENGINE.tcn similarity index 100% rename from models/Archive/STEAM ENGINE.tcn rename to project/models/Archive/STEAM ENGINE.tcn diff --git a/models/Archive/SteamPiston.tcn b/project/models/Archive/SteamPiston.tcn similarity index 100% rename from models/Archive/SteamPiston.tcn rename to project/models/Archive/SteamPiston.tcn diff --git a/models/Archive/TankCorner2.tcn b/project/models/Archive/TankCorner2.tcn similarity index 100% rename from models/Archive/TankCorner2.tcn rename to project/models/Archive/TankCorner2.tcn diff --git a/models/Archive/TankSingle2.tcn b/project/models/Archive/TankSingle2.tcn similarity index 100% rename from models/Archive/TankSingle2.tcn rename to project/models/Archive/TankSingle2.tcn diff --git a/models/Archive/furnace.tcn b/project/models/Archive/furnace.tcn similarity index 100% rename from models/Archive/furnace.tcn rename to project/models/Archive/furnace.tcn diff --git a/models/Archive/submittedPipe.tcn b/project/models/Archive/submittedPipe.tcn similarity index 100% rename from models/Archive/submittedPipe.tcn rename to project/models/Archive/submittedPipe.tcn diff --git a/models/Chicken.tcn b/project/models/Chicken.tcn similarity index 100% rename from models/Chicken.tcn rename to project/models/Chicken.tcn diff --git a/models/CoalGen.tcn b/project/models/CoalGen.tcn similarity index 100% rename from models/CoalGen.tcn rename to project/models/CoalGen.tcn diff --git a/models/Crane/ArmMountPoint.tcn b/project/models/Crane/ArmMountPoint.tcn similarity index 100% rename from models/Crane/ArmMountPoint.tcn rename to project/models/Crane/ArmMountPoint.tcn diff --git a/models/Crane/CraneController.tcn b/project/models/Crane/CraneController.tcn similarity index 100% rename from models/Crane/CraneController.tcn rename to project/models/Crane/CraneController.tcn diff --git a/models/Crane/CraneFrame.tcn b/project/models/Crane/CraneFrame.tcn similarity index 100% rename from models/Crane/CraneFrame.tcn rename to project/models/Crane/CraneFrame.tcn diff --git a/models/Crane/Laser Drill.tcn b/project/models/Crane/Laser Drill.tcn similarity index 100% rename from models/Crane/Laser Drill.tcn rename to project/models/Crane/Laser Drill.tcn diff --git a/models/Crane/craneArm.tcn b/project/models/Crane/craneArm.tcn similarity index 100% rename from models/Crane/craneArm.tcn rename to project/models/Crane/craneArm.tcn diff --git a/models/Crane/craneArmHoist.tcn b/project/models/Crane/craneArmHoist.tcn similarity index 100% rename from models/Crane/craneArmHoist.tcn rename to project/models/Crane/craneArmHoist.tcn diff --git a/models/Current_Models/BasicPump.tcn b/project/models/Current_Models/BasicPump.tcn similarity index 100% rename from models/Current_Models/BasicPump.tcn rename to project/models/Current_Models/BasicPump.tcn diff --git a/models/Current_Models/ConstructionPump.tcn b/project/models/Current_Models/ConstructionPump.tcn similarity index 100% rename from models/Current_Models/ConstructionPump.tcn rename to project/models/Current_Models/ConstructionPump.tcn diff --git a/models/Current_Models/GearShaft.tcn b/project/models/Current_Models/GearShaft.tcn similarity index 100% rename from models/Current_Models/GearShaft.tcn rename to project/models/Current_Models/GearShaft.tcn diff --git a/models/Current_Models/GearShaftPiston.tcn b/project/models/Current_Models/GearShaftPiston.tcn similarity index 100% rename from models/Current_Models/GearShaftPiston.tcn rename to project/models/Current_Models/GearShaftPiston.tcn diff --git a/models/Current_Models/Generator.tcn b/project/models/Current_Models/Generator.tcn similarity index 100% rename from models/Current_Models/Generator.tcn rename to project/models/Current_Models/Generator.tcn diff --git a/models/Current_Models/HandValve.tcn b/project/models/Current_Models/HandValve.tcn similarity index 100% rename from models/Current_Models/HandValve.tcn rename to project/models/Current_Models/HandValve.tcn diff --git a/models/Current_Models/LargePipe.tcn b/project/models/Current_Models/LargePipe.tcn similarity index 100% rename from models/Current_Models/LargePipe.tcn rename to project/models/Current_Models/LargePipe.tcn diff --git a/models/Current_Models/MechRod.tcn b/project/models/Current_Models/MechRod.tcn similarity index 100% rename from models/Current_Models/MechRod.tcn rename to project/models/Current_Models/MechRod.tcn diff --git a/models/Current_Models/Piston.tcn b/project/models/Current_Models/Piston.tcn similarity index 100% rename from models/Current_Models/Piston.tcn rename to project/models/Current_Models/Piston.tcn diff --git a/models/Current_Models/Sink.tcn b/project/models/Current_Models/Sink.tcn similarity index 100% rename from models/Current_Models/Sink.tcn rename to project/models/Current_Models/Sink.tcn diff --git a/models/Current_Models/Tank.tcn b/project/models/Current_Models/Tank.tcn similarity index 100% rename from models/Current_Models/Tank.tcn rename to project/models/Current_Models/Tank.tcn diff --git a/models/Current_Models/TankSide.java b/project/models/Current_Models/TankSide.java similarity index 100% rename from models/Current_Models/TankSide.java rename to project/models/Current_Models/TankSide.java diff --git a/models/Current_Models/TankSide.png b/project/models/Current_Models/TankSide.png similarity index 100% rename from models/Current_Models/TankSide.png rename to project/models/Current_Models/TankSide.png diff --git a/models/Current_Models/pipe.tcn b/project/models/Current_Models/pipe.tcn similarity index 100% rename from models/Current_Models/pipe.tcn rename to project/models/Current_Models/pipe.tcn diff --git a/models/DontChangeTheFilesOrMoveThings.txt b/project/models/DontChangeTheFilesOrMoveThings.txt similarity index 100% rename from models/DontChangeTheFilesOrMoveThings.txt rename to project/models/DontChangeTheFilesOrMoveThings.txt diff --git a/models/ElectricFurnace.tcn b/project/models/ElectricFurnace.tcn similarity index 100% rename from models/ElectricFurnace.tcn rename to project/models/ElectricFurnace.tcn diff --git a/models/FluidCan.tcn b/project/models/FluidCan.tcn similarity index 100% rename from models/FluidCan.tcn rename to project/models/FluidCan.tcn diff --git a/models/Machines/Armbot.tcn b/project/models/Machines/Armbot.tcn similarity index 100% rename from models/Machines/Armbot.tcn rename to project/models/Machines/Armbot.tcn diff --git a/models/Machines/Conveyor Belt.tcn b/project/models/Machines/Conveyor Belt.tcn similarity index 100% rename from models/Machines/Conveyor Belt.tcn rename to project/models/Machines/Conveyor Belt.tcn diff --git a/models/Machines/CrusherSingleBlock.tcn b/project/models/Machines/CrusherSingleBlock.tcn similarity index 100% rename from models/Machines/CrusherSingleBlock.tcn rename to project/models/Machines/CrusherSingleBlock.tcn diff --git a/models/Machines/GrinderSingleBlock.tcn b/project/models/Machines/GrinderSingleBlock.tcn similarity index 100% rename from models/Machines/GrinderSingleBlock.tcn rename to project/models/Machines/GrinderSingleBlock.tcn diff --git a/models/Machines/Manipulator.tcn b/project/models/Machines/Manipulator.tcn similarity index 100% rename from models/Machines/Manipulator.tcn rename to project/models/Machines/Manipulator.tcn diff --git a/models/Machines/Rejector.tcn b/project/models/Machines/Rejector.tcn similarity index 100% rename from models/Machines/Rejector.tcn rename to project/models/Machines/Rejector.tcn diff --git a/models/Machines/SlantedBelt.tcn b/project/models/Machines/SlantedBelt.tcn similarity index 100% rename from models/Machines/SlantedBelt.tcn rename to project/models/Machines/SlantedBelt.tcn diff --git a/models/SolarPanelSingle.tcn b/project/models/SolarPanelSingle.tcn similarity index 100% rename from models/SolarPanelSingle.tcn rename to project/models/SolarPanelSingle.tcn diff --git a/models/SteamGenerator.tcn b/project/models/SteamGenerator.tcn similarity index 100% rename from models/SteamGenerator.tcn rename to project/models/SteamGenerator.tcn diff --git a/models/SteamGenerator2.tcn b/project/models/SteamGenerator2.tcn similarity index 100% rename from models/SteamGenerator2.tcn rename to project/models/SteamGenerator2.tcn diff --git a/models/TankBodyA.tcn b/project/models/TankBodyA.tcn similarity index 100% rename from models/TankBodyA.tcn rename to project/models/TankBodyA.tcn diff --git a/models/TestCar.tcn b/project/models/TestCar.tcn similarity index 100% rename from models/TestCar.tcn rename to project/models/TestCar.tcn diff --git a/models/Turkey.tcn b/project/models/Turkey.tcn similarity index 100% rename from models/Turkey.tcn rename to project/models/Turkey.tcn diff --git a/models/WIP--Extra/Crusher.tcn b/project/models/WIP--Extra/Crusher.tcn similarity index 100% rename from models/WIP--Extra/Crusher.tcn rename to project/models/WIP--Extra/Crusher.tcn diff --git a/models/WIP--Extra/DropBox.tcn b/project/models/WIP--Extra/DropBox.tcn similarity index 100% rename from models/WIP--Extra/DropBox.tcn rename to project/models/WIP--Extra/DropBox.tcn diff --git a/models/WIP--Extra/LargeOneWayRail.tcn b/project/models/WIP--Extra/LargeOneWayRail.tcn similarity index 100% rename from models/WIP--Extra/LargeOneWayRail.tcn rename to project/models/WIP--Extra/LargeOneWayRail.tcn diff --git a/models/WIP--Extra/LargeRailPully.tcn b/project/models/WIP--Extra/LargeRailPully.tcn similarity index 100% rename from models/WIP--Extra/LargeRailPully.tcn rename to project/models/WIP--Extra/LargeRailPully.tcn diff --git a/models/WIP--Extra/Old-Rejector.tcn b/project/models/WIP--Extra/Old-Rejector.tcn similarity index 100% rename from models/WIP--Extra/Old-Rejector.tcn rename to project/models/WIP--Extra/Old-Rejector.tcn diff --git a/models/WIP--Extra/Scooper.tcn b/project/models/WIP--Extra/Scooper.tcn similarity index 100% rename from models/WIP--Extra/Scooper.tcn rename to project/models/WIP--Extra/Scooper.tcn diff --git a/models/WIP--Extra/Stamp.tcn b/project/models/WIP--Extra/Stamp.tcn similarity index 100% rename from models/WIP--Extra/Stamp.tcn rename to project/models/WIP--Extra/Stamp.tcn diff --git a/models/WIP/Condensor.tcn b/project/models/WIP/Condensor.tcn similarity index 100% rename from models/WIP/Condensor.tcn rename to project/models/WIP/Condensor.tcn diff --git a/models/WIP/WindMill.tcn b/project/models/WIP/WindMill.tcn similarity index 100% rename from models/WIP/WindMill.tcn rename to project/models/WIP/WindMill.tcn diff --git a/models/WIP/battery box.tcn b/project/models/WIP/battery box.tcn similarity index 100% rename from models/WIP/battery box.tcn rename to project/models/WIP/battery box.tcn diff --git a/models/WIP/battery.tcn b/project/models/WIP/battery.tcn similarity index 100% rename from models/WIP/battery.tcn rename to project/models/WIP/battery.tcn diff --git a/models/WIP/coilSide.tcn b/project/models/WIP/coilSide.tcn similarity index 100% rename from models/WIP/coilSide.tcn rename to project/models/WIP/coilSide.tcn diff --git a/models/WIP/lightning rod.tcn b/project/models/WIP/lightning rod.tcn similarity index 100% rename from models/WIP/lightning rod.tcn rename to project/models/WIP/lightning rod.tcn diff --git a/models/WIP/switch 2 down.tcn b/project/models/WIP/switch 2 down.tcn similarity index 100% rename from models/WIP/switch 2 down.tcn rename to project/models/WIP/switch 2 down.tcn diff --git a/models/WIP/switch 3 down.tcn b/project/models/WIP/switch 3 down.tcn similarity index 100% rename from models/WIP/switch 3 down.tcn rename to project/models/WIP/switch 3 down.tcn diff --git a/models/WIP/switch down.tcn b/project/models/WIP/switch down.tcn similarity index 100% rename from models/WIP/switch down.tcn rename to project/models/WIP/switch down.tcn diff --git a/models/WIP/transformerCoil.tcn b/project/models/WIP/transformerCoil.tcn similarity index 100% rename from models/WIP/transformerCoil.tcn rename to project/models/WIP/transformerCoil.tcn diff --git a/models/WIP/tube.tcn b/project/models/WIP/tube.tcn similarity index 100% rename from models/WIP/tube.tcn rename to project/models/WIP/tube.tcn diff --git a/models/batteryBox.tcn b/project/models/batteryBox.tcn similarity index 100% rename from models/batteryBox.tcn rename to project/models/batteryBox.tcn diff --git a/models/laserTransmitter.tcn b/project/models/laserTransmitter.tcn similarity index 100% rename from models/laserTransmitter.tcn rename to project/models/laserTransmitter.tcn diff --git a/models/rejected/Pump3.tcn b/project/models/rejected/Pump3.tcn similarity index 100% rename from models/rejected/Pump3.tcn rename to project/models/rejected/Pump3.tcn diff --git a/models/rejected/PumpV2.tcn b/project/models/rejected/PumpV2.tcn similarity index 100% rename from models/rejected/PumpV2.tcn rename to project/models/rejected/PumpV2.tcn diff --git a/models/rejected/something.tcn b/project/models/rejected/something.tcn similarity index 100% rename from models/rejected/something.tcn rename to project/models/rejected/something.tcn diff --git a/bin/GitUpdateDep.bat b/project/scripts/GitUpdateDep.bat similarity index 100% rename from bin/GitUpdateDep.bat rename to project/scripts/GitUpdateDep.bat diff --git a/bin/GitUpdateSubs.bat b/project/scripts/GitUpdateSubs.bat similarity index 100% rename from bin/GitUpdateSubs.bat rename to project/scripts/GitUpdateSubs.bat diff --git a/resources/MANIFEST.MF b/resources/MANIFEST.MF deleted file mode 100644 index df250c583..000000000 --- a/resources/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -FMLCorePlugin: dark.core.DarkCorePlugin diff --git a/APIs/buildcraft/api/tools/IToolWrench.java b/src/APIs/buildcraft/api/tools/IToolWrench.java similarity index 100% rename from APIs/buildcraft/api/tools/IToolWrench.java rename to src/APIs/buildcraft/api/tools/IToolWrench.java diff --git a/APIs/ic2/api/tile/IWrenchable.java b/src/APIs/ic2/api/tile/IWrenchable.java similarity index 100% rename from APIs/ic2/api/tile/IWrenchable.java rename to src/APIs/ic2/api/tile/IWrenchable.java diff --git a/APIs/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java b/src/APIs/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java similarity index 100% rename from APIs/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java rename to src/APIs/micdoodle8/mods/galacticraft/api/world/ISolarLevel.java diff --git a/APIs/org/modstats/IModstatsReporter.java b/src/APIs/org/modstats/IModstatsReporter.java similarity index 100% rename from APIs/org/modstats/IModstatsReporter.java rename to src/APIs/org/modstats/IModstatsReporter.java diff --git a/APIs/org/modstats/ModVersionData.java b/src/APIs/org/modstats/ModVersionData.java similarity index 100% rename from APIs/org/modstats/ModVersionData.java rename to src/APIs/org/modstats/ModVersionData.java diff --git a/APIs/org/modstats/ModsUpdateEvent.java b/src/APIs/org/modstats/ModsUpdateEvent.java similarity index 100% rename from APIs/org/modstats/ModsUpdateEvent.java rename to src/APIs/org/modstats/ModsUpdateEvent.java diff --git a/APIs/org/modstats/ModstatInfo.java b/src/APIs/org/modstats/ModstatInfo.java similarity index 100% rename from APIs/org/modstats/ModstatInfo.java rename to src/APIs/org/modstats/ModstatInfo.java diff --git a/APIs/org/modstats/Modstats.java b/src/APIs/org/modstats/Modstats.java similarity index 100% rename from APIs/org/modstats/Modstats.java rename to src/APIs/org/modstats/Modstats.java diff --git a/APIs/org/modstats/reporter/v1/Config.java b/src/APIs/org/modstats/reporter/v1/Config.java similarity index 100% rename from APIs/org/modstats/reporter/v1/Config.java rename to src/APIs/org/modstats/reporter/v1/Config.java diff --git a/APIs/org/modstats/reporter/v1/DataSender.java b/src/APIs/org/modstats/reporter/v1/DataSender.java similarity index 100% rename from APIs/org/modstats/reporter/v1/DataSender.java rename to src/APIs/org/modstats/reporter/v1/DataSender.java diff --git a/APIs/org/modstats/reporter/v1/Reporter.java b/src/APIs/org/modstats/reporter/v1/Reporter.java similarity index 100% rename from APIs/org/modstats/reporter/v1/Reporter.java rename to src/APIs/org/modstats/reporter/v1/Reporter.java diff --git a/src/com/builtbroken/assemblyline/multipart/TraitConductor.java b/src/com/builtbroken/assemblyline/multipart/TraitConductor.java deleted file mode 100644 index 62902ec3b..000000000 --- a/src/com/builtbroken/assemblyline/multipart/TraitConductor.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.builtbroken.assemblyline.multipart; - -import java.util.HashSet; -import java.util.Set; - -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.api.energy.IConductor; -import universalelectricity.api.energy.IEnergyNetwork; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; - -public class TraitConductor extends TileMultipart implements IConductor -{ - public Set interfaces = new HashSet(); - - @Override - public void copyFrom(TileMultipart that) - { - super.copyFrom(that); - - if (that instanceof TraitConductor) - { - this.interfaces = ((TraitConductor) that).interfaces; - } - } - - @Override - public void bindPart(TMultiPart part) - { - super.bindPart(part); - - if (part instanceof IConductor) - { - this.interfaces.add((IConductor) part); - } - } - - @Override - public void partRemoved(TMultiPart part, int p) - { - super.partRemoved(part, p); - - if (part instanceof IConductor) - { - this.interfaces.remove(part); - } - } - - @Override - public void clearParts() - { - super.clearParts(); - this.interfaces.clear(); - } - - @Override - public Object[] getConnections() - { - for (IConductor conductor : this.interfaces) - { - return conductor.getConnections(); - } - - return null; - } - - @Override - public IEnergyNetwork getNetwork() - { - for (IConductor conductor : this.interfaces) - { - return conductor.getNetwork(); - } - - return null; - } - - @Override - public void setNetwork(IEnergyNetwork network) - { - for (IConductor conductor : this.interfaces) - { - conductor.setNetwork(network); - } - } - - @Override - public boolean canConnect(ForgeDirection direction) - { - for (IConductor conductor : this.interfaces) - { - if (conductor.canConnect(direction)) - { - return true; - } - } - - return false; - } - - @Override - public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive) - { - /** - * Try out different sides to try to inject energy into. - */ - if (this.partMap(from.ordinal()) == null) - { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) - { - if (dir != from.getOpposite()) - { - TMultiPart part = this.partMap(dir.ordinal()); - - if (this.interfaces.contains(part)) - { - return ((IConductor) part).onReceiveEnergy(from, receive, doReceive); - } - } - } - } - - return 0; - } - - @Override - public long onExtractEnergy(ForgeDirection from, long extract, boolean doExtract) - { - return 0; - } - - @Override - public float getResistance() - { - long energyLoss = 0; - - if (this.interfaces.size() > 0) - { - for (IConductor conductor : this.interfaces) - { - energyLoss += conductor.getResistance(); - } - - energyLoss /= this.interfaces.size(); - } - - return energyLoss; - } - - @Override - public long getTransferCapacity() - { - long capacitance = 0; - - if (this.interfaces.size() > 0) - { - for (IConductor conductor : this.interfaces) - { - capacitance += conductor.getTransferCapacity(); - } - - capacitance /= this.interfaces.size(); - } - - return capacitance; - } - -} \ No newline at end of file diff --git a/src/com/builtbroken/assemblyline/ALRecipeLoader.java b/src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java similarity index 100% rename from src/com/builtbroken/assemblyline/ALRecipeLoader.java rename to src/main/java/com/builtbroken/assemblyline/ALRecipeLoader.java diff --git a/src/com/builtbroken/assemblyline/AssemblyLine.java b/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java similarity index 100% rename from src/com/builtbroken/assemblyline/AssemblyLine.java rename to src/main/java/com/builtbroken/assemblyline/AssemblyLine.java diff --git a/src/com/builtbroken/assemblyline/CommonProxy.java b/src/main/java/com/builtbroken/assemblyline/CommonProxy.java similarity index 100% rename from src/com/builtbroken/assemblyline/CommonProxy.java rename to src/main/java/com/builtbroken/assemblyline/CommonProxy.java diff --git a/src/com/builtbroken/assemblyline/api/AutoCraftEvent.java b/src/main/java/com/builtbroken/assemblyline/api/AutoCraftEvent.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/AutoCraftEvent.java rename to src/main/java/com/builtbroken/assemblyline/api/AutoCraftEvent.java diff --git a/src/com/builtbroken/assemblyline/api/IArmbot.java b/src/main/java/com/builtbroken/assemblyline/api/IArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IArmbot.java rename to src/main/java/com/builtbroken/assemblyline/api/IArmbot.java diff --git a/src/com/builtbroken/assemblyline/api/IArmbotUseable.java b/src/main/java/com/builtbroken/assemblyline/api/IArmbotUseable.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IArmbotUseable.java rename to src/main/java/com/builtbroken/assemblyline/api/IArmbotUseable.java diff --git a/src/com/builtbroken/assemblyline/api/IBelt.java b/src/main/java/com/builtbroken/assemblyline/api/IBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IBelt.java rename to src/main/java/com/builtbroken/assemblyline/api/IBelt.java diff --git a/src/com/builtbroken/assemblyline/api/IFilterable.java b/src/main/java/com/builtbroken/assemblyline/api/IFilterable.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IFilterable.java rename to src/main/java/com/builtbroken/assemblyline/api/IFilterable.java diff --git a/src/com/builtbroken/assemblyline/api/IManipulator.java b/src/main/java/com/builtbroken/assemblyline/api/IManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IManipulator.java rename to src/main/java/com/builtbroken/assemblyline/api/IManipulator.java diff --git a/src/com/builtbroken/assemblyline/api/IRotatable.java b/src/main/java/com/builtbroken/assemblyline/api/IRotatable.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IRotatable.java rename to src/main/java/com/builtbroken/assemblyline/api/IRotatable.java diff --git a/src/com/builtbroken/assemblyline/api/IRotatableBlock.java b/src/main/java/com/builtbroken/assemblyline/api/IRotatableBlock.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IRotatableBlock.java rename to src/main/java/com/builtbroken/assemblyline/api/IRotatableBlock.java diff --git a/src/com/builtbroken/assemblyline/api/IServo.java b/src/main/java/com/builtbroken/assemblyline/api/IServo.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IServo.java rename to src/main/java/com/builtbroken/assemblyline/api/IServo.java diff --git a/src/com/builtbroken/assemblyline/api/IServoHandler.java b/src/main/java/com/builtbroken/assemblyline/api/IServoHandler.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/IServoHandler.java rename to src/main/java/com/builtbroken/assemblyline/api/IServoHandler.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IDataItem.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IDataItem.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IDataItem.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IDataItem.java diff --git a/src/com/builtbroken/assemblyline/api/coding/ILogicTask.java b/src/main/java/com/builtbroken/assemblyline/api/coding/ILogicTask.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/ILogicTask.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/ILogicTask.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IMemorySlot.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IMemorySlot.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IMemorySlot.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IMemorySlot.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IProcessTask.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IProcessTask.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IProcessTask.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IProcessTask.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IProgram.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IProgram.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IProgram.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IProgram.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IProgramItem.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IProgramItem.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IProgramItem.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IProgramItem.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IProgrammableMachine.java diff --git a/src/com/builtbroken/assemblyline/api/coding/IRedirectTask.java b/src/main/java/com/builtbroken/assemblyline/api/coding/IRedirectTask.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/IRedirectTask.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/IRedirectTask.java diff --git a/src/com/builtbroken/assemblyline/api/coding/ITask.java b/src/main/java/com/builtbroken/assemblyline/api/coding/ITask.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/ITask.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/ITask.java diff --git a/src/com/builtbroken/assemblyline/api/coding/ProgramHelper.java b/src/main/java/com/builtbroken/assemblyline/api/coding/ProgramHelper.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/ProgramHelper.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/ProgramHelper.java diff --git a/src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java b/src/main/java/com/builtbroken/assemblyline/api/coding/TaskRegistry.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/TaskRegistry.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/TaskRegistry.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentData.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentDoubleData.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentEntityList.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentFloatData.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentIntData.java diff --git a/src/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java b/src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java rename to src/main/java/com/builtbroken/assemblyline/api/coding/args/ArgumentListData.java diff --git a/src/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java b/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java rename to src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMasterList.java diff --git a/src/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java b/src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java rename to src/main/java/com/builtbroken/assemblyline/api/fluid/FluidMixingEvent.java diff --git a/src/com/builtbroken/assemblyline/api/fluid/IDrain.java b/src/main/java/com/builtbroken/assemblyline/api/fluid/IDrain.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/fluid/IDrain.java rename to src/main/java/com/builtbroken/assemblyline/api/fluid/IDrain.java diff --git a/src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java b/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java rename to src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkFluidPart.java diff --git a/src/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java b/src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java rename to src/main/java/com/builtbroken/assemblyline/api/fluid/INetworkPipe.java diff --git a/src/com/builtbroken/assemblyline/armbot/BlockArmbot.java b/src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/BlockArmbot.java rename to src/main/java/com/builtbroken/assemblyline/armbot/BlockArmbot.java diff --git a/src/com/builtbroken/assemblyline/armbot/Program.java b/src/main/java/com/builtbroken/assemblyline/armbot/Program.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/Program.java rename to src/main/java/com/builtbroken/assemblyline/armbot/Program.java diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBase.java b/src/main/java/com/builtbroken/assemblyline/armbot/TaskBase.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/TaskBase.java rename to src/main/java/com/builtbroken/assemblyline/armbot/TaskBase.java diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java b/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java rename to src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseArmbot.java diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java b/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java rename to src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseLogic.java diff --git a/src/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java b/src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java rename to src/main/java/com/builtbroken/assemblyline/armbot/TaskBaseProcess.java diff --git a/src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java b/src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java rename to src/main/java/com/builtbroken/assemblyline/armbot/TileEntityArmbot.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskBreak.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskBreak.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskBreak.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskDrop.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskDrop.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskDrop.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskEnd.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskEnd.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskEnd.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskEnd.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskFire.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskFire.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskFire.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskFire.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGOTO.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGive.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGive.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskGive.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGive.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabEntity.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabItem.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskGrabPrefab.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskHarvest.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskIF.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIF.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskIF.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIF.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskIdle.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIdle.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskIdle.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskIdle.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskPlace.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskPlace.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskPlace.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskReturn.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskReturn.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskReturn.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskReturn.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateBy.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskRotateTo.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskStart.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskStart.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskStart.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskStart.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskTake.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskTake.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskTake.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskTake.java diff --git a/src/com/builtbroken/assemblyline/armbot/command/TaskUse.java b/src/main/java/com/builtbroken/assemblyline/armbot/command/TaskUse.java similarity index 100% rename from src/com/builtbroken/assemblyline/armbot/command/TaskUse.java rename to src/main/java/com/builtbroken/assemblyline/armbot/command/TaskUse.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockAssembly.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockAssembly.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockAssembly.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockAssembly.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockBasalt.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockBasalt.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockBasalt.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockBasalt.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlass.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockColorGlass.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlass.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockColorGlowGlass.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockColorSand.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockColorSand.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockColorSand.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockColorSand.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockColored.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockColored.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockColored.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockColored.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockGasOre.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockGasOre.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockGasOre.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockGasOre.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockHydraulic.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockHydraulic.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockHydraulic.java diff --git a/src/com/builtbroken/assemblyline/blocks/BlockOre.java b/src/main/java/com/builtbroken/assemblyline/blocks/BlockOre.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/BlockOre.java rename to src/main/java/com/builtbroken/assemblyline/blocks/BlockOre.java diff --git a/src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java b/src/main/java/com/builtbroken/assemblyline/blocks/GasOreGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/GasOreGenerator.java rename to src/main/java/com/builtbroken/assemblyline/blocks/GasOreGenerator.java diff --git a/src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java b/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java rename to src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockBasalt.java diff --git a/src/com/builtbroken/assemblyline/blocks/ItemBlockColored.java b/src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockColored.java similarity index 100% rename from src/com/builtbroken/assemblyline/blocks/ItemBlockColored.java rename to src/main/java/com/builtbroken/assemblyline/blocks/ItemBlockColored.java diff --git a/src/com/builtbroken/assemblyline/client/ClientProxy.java b/src/main/java/com/builtbroken/assemblyline/client/ClientProxy.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/ClientProxy.java rename to src/main/java/com/builtbroken/assemblyline/client/ClientProxy.java diff --git a/src/com/builtbroken/assemblyline/client/SoundHandler.java b/src/main/java/com/builtbroken/assemblyline/client/SoundHandler.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/SoundHandler.java rename to src/main/java/com/builtbroken/assemblyline/client/SoundHandler.java diff --git a/src/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java b/src/main/java/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/EnumTaskIcon.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiBatteryBox.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEditTask.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiEditTask.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiEditTask.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderBase.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderCoder.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderHelp.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiEncoderInventory.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiImprinter.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiImprinter.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiImprinter.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiManipulator.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiManipulator.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiProcessor.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiProcessor.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiProcessor.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiTask.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTask.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiTask.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiTask.java diff --git a/src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java b/src/main/java/com/builtbroken/assemblyline/client/gui/GuiTaskList.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/gui/GuiTaskList.java rename to src/main/java/com/builtbroken/assemblyline/client/gui/GuiTaskList.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelAdvancedHopper.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelAngledBelt.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelArmbot.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelArmbot.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelArmbot.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelCenterTank.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelCenterTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelCenterTank.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelCenterTank.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelConstructionPump.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelConveyorBelt.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelCopperWire.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelCopperWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelCopperWire.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelCopperWire.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelCornerTank.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelCornerTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelCornerTank.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelCornerTank.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelCrusher.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelCrusher.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelCrusher.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelCrusher.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelElecFurnace.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelEngine.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelEngine.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelEngine.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelEngine.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelFurnace.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelFurnace.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelFurnace.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelFurnace.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelGearPiston.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelGearPiston.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelGearPiston.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelGearRod.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelGearRod.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelGearRod.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelGearRod.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelGenerator.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelGenerator.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelGenerator.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelGrinder.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelGrinder.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelGrinder.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelGrinder.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelHelper.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelHelper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelHelper.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelHelper.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelLargePipe.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelLargePipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelLargePipe.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelLargePipe.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelLiquidTankCorner.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelMachine.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelMachine.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelMachine.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelMachine.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelManipulator.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelManipulator.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelManipulator.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelPump.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelPump.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelPump.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelRejectorPiston.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelReleaseValve.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelSink.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelSink.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelSink.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelSink.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelSmallFluidCan.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelSolarPanel.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelSteamGen.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamGen.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelSteamGen.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamGen.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelSteamTurbine.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelTank.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelTank.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelTank.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelTankSide.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelTankSide.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelTankSide.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelTankSide.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelTestCar.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelTestCar.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelTestCar.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelTestCar.java diff --git a/src/com/builtbroken/assemblyline/client/model/ModelTurkey.java b/src/main/java/com/builtbroken/assemblyline/client/model/ModelTurkey.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/model/ModelTurkey.java rename to src/main/java/com/builtbroken/assemblyline/client/model/ModelTurkey.java diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java b/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java rename to src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderHelper.java diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java b/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java rename to src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderInfo.java diff --git a/src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java b/src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java rename to src/main/java/com/builtbroken/assemblyline/client/render/BlockRenderingHandler.java diff --git a/src/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java b/src/main/java/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java rename to src/main/java/com/builtbroken/assemblyline/client/render/EntityFakeBlock.java diff --git a/src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java b/src/main/java/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java rename to src/main/java/com/builtbroken/assemblyline/client/render/ItemPipeRenderer.java diff --git a/src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java b/src/main/java/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java rename to src/main/java/com/builtbroken/assemblyline/client/render/ItemRenderFluidCan.java diff --git a/src/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java b/src/main/java/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java rename to src/main/java/com/builtbroken/assemblyline/client/render/ItemTankRenderer.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderAdvancedHopper.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderArmbot.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderArmbot.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderArmbot.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderArmbot.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockEntity.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockSolarPanel.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderBlockWire.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderBlockWire.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderBlockWire.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderConstructionPump.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderConveyorBelt.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderCrate.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderCrate.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderCrate.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderDetector.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderDetector.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderDetector.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderDetector.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderFluidHelper.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderFurnace.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderFurnace.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderFurnace.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderFurnace.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderGearPiston.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderGearPiston.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderGearRod.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderGearRod.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderGearRod.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderGearRod.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderGenerator.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderGenerator.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderGenerator.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderHelper.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderHelper.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderHelper.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderHelper.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderImprintable.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderImprintable.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderImprintable.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderImprintable.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderManipulator.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderManipulator.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderManipulator.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderPipe.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderPipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderPipe.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderPipe.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderProcessor.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderProcessor.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderProcessor.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderProcessor.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderPump.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderPump.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderPump.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderRejector.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderRejector.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderRejector.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderRejector.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderReleaseValve.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderSink.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderSink.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderSink.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderSink.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderSteamGen.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderSteamGen.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderSteamGen.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderSteamGen.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderTank.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderTank.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderTank.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderTestCar.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderTestCar.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderTestCar.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderTestCar.java diff --git a/src/com/builtbroken/assemblyline/client/render/RenderTurkey.java b/src/main/java/com/builtbroken/assemblyline/client/render/RenderTurkey.java similarity index 100% rename from src/com/builtbroken/assemblyline/client/render/RenderTurkey.java rename to src/main/java/com/builtbroken/assemblyline/client/render/RenderTurkey.java diff --git a/src/com/builtbroken/assemblyline/entities/EntityFarmEgg.java b/src/main/java/com/builtbroken/assemblyline/entities/EntityFarmEgg.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/EntityFarmEgg.java rename to src/main/java/com/builtbroken/assemblyline/entities/EntityFarmEgg.java diff --git a/src/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java b/src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java rename to src/main/java/com/builtbroken/assemblyline/entities/EntityMutantAnimal.java diff --git a/src/com/builtbroken/assemblyline/entities/EntityTurkey.java b/src/main/java/com/builtbroken/assemblyline/entities/EntityTurkey.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/EntityTurkey.java rename to src/main/java/com/builtbroken/assemblyline/entities/EntityTurkey.java diff --git a/src/com/builtbroken/assemblyline/entities/EnumBird.java b/src/main/java/com/builtbroken/assemblyline/entities/EnumBird.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/EnumBird.java rename to src/main/java/com/builtbroken/assemblyline/entities/EnumBird.java diff --git a/src/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java b/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java rename to src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityAdvanced.java diff --git a/src/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java b/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java rename to src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityTestCar.java diff --git a/src/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java b/src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java rename to src/main/java/com/builtbroken/assemblyline/entities/prefab/EntityVehicle.java diff --git a/src/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java b/src/main/java/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java similarity index 100% rename from src/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java rename to src/main/java/com/builtbroken/assemblyline/entities/prefab/ItemVehicleSpawn.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/FluidCraftingHandler.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/FluidPressurePack.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/FluidRecipeInfo.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/IFluidRecipeCrafter.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidContainers.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkFluidTiles.java diff --git a/src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java b/src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java rename to src/main/java/com/builtbroken/assemblyline/fluid/network/NetworkPipes.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/BlockPipe.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumPipeType.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/EnumTankTypes.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/FluidPartsMaterial.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/IPipeType.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/ItemBlockPipe.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/TileEntityPipe.java diff --git a/src/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java b/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java rename to src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidDevice.java diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java b/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java rename to src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidNetworkTile.java diff --git a/src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java b/src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java rename to src/main/java/com/builtbroken/assemblyline/fluid/prefab/TileEntityFluidStorage.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockConstructionPump.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockDrain.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/BlockPumpMachine.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/LiquidPathFinder.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityConstructionPump.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityDrain.java diff --git a/src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java b/src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java similarity index 100% rename from src/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java rename to src/main/java/com/builtbroken/assemblyline/fluid/pump/TileEntityStarterPump.java diff --git a/src/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java b/src/main/java/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java rename to src/main/java/com/builtbroken/assemblyline/generators/BlockSmallSteamGen.java diff --git a/src/com/builtbroken/assemblyline/generators/BlockSolarPanel.java b/src/main/java/com/builtbroken/assemblyline/generators/BlockSolarPanel.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/BlockSolarPanel.java rename to src/main/java/com/builtbroken/assemblyline/generators/BlockSolarPanel.java diff --git a/src/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java b/src/main/java/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java rename to src/main/java/com/builtbroken/assemblyline/generators/ContainerCoalGenerator.java diff --git a/src/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java rename to src/main/java/com/builtbroken/assemblyline/generators/TileEntitySolarPanel.java diff --git a/src/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java rename to src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamFan.java diff --git a/src/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java rename to src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamGen.java diff --git a/src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java b/src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java rename to src/main/java/com/builtbroken/assemblyline/generators/TileEntitySteamPiston.java diff --git a/src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java b/src/main/java/com/builtbroken/assemblyline/imprinter/BlockImprinter.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/BlockImprinter.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/BlockImprinter.java diff --git a/src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java b/src/main/java/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/ContainerImprinter.java diff --git a/src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java b/src/main/java/com/builtbroken/assemblyline/imprinter/ItemImprinter.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/ItemImprinter.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/ItemImprinter.java diff --git a/src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java b/src/main/java/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/TileEntityImprinter.java diff --git a/src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java b/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/prefab/BlockImprintable.java diff --git a/src/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java b/src/main/java/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java similarity index 100% rename from src/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java rename to src/main/java/com/builtbroken/assemblyline/imprinter/prefab/TileEntityFilterable.java diff --git a/src/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java b/src/main/java/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java rename to src/main/java/com/builtbroken/assemblyline/item/BehaviorDispenseEgg.java diff --git a/src/com/builtbroken/assemblyline/item/EnumTool.java b/src/main/java/com/builtbroken/assemblyline/item/EnumTool.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/EnumTool.java rename to src/main/java/com/builtbroken/assemblyline/item/EnumTool.java diff --git a/src/com/builtbroken/assemblyline/item/ItemBattery.java b/src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemBattery.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemBattery.java diff --git a/src/com/builtbroken/assemblyline/item/ItemBlockOre.java b/src/main/java/com/builtbroken/assemblyline/item/ItemBlockOre.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemBlockOre.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemBlockOre.java diff --git a/src/com/builtbroken/assemblyline/item/ItemColoredDust.java b/src/main/java/com/builtbroken/assemblyline/item/ItemColoredDust.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemColoredDust.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemColoredDust.java diff --git a/src/com/builtbroken/assemblyline/item/ItemCommonTool.java b/src/main/java/com/builtbroken/assemblyline/item/ItemCommonTool.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemCommonTool.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemCommonTool.java diff --git a/src/com/builtbroken/assemblyline/item/ItemFarmBucket.java b/src/main/java/com/builtbroken/assemblyline/item/ItemFarmBucket.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemFarmBucket.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemFarmBucket.java diff --git a/src/com/builtbroken/assemblyline/item/ItemFarmEgg.java b/src/main/java/com/builtbroken/assemblyline/item/ItemFarmEgg.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemFarmEgg.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemFarmEgg.java diff --git a/src/com/builtbroken/assemblyline/item/ItemFarmFood.java b/src/main/java/com/builtbroken/assemblyline/item/ItemFarmFood.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemFarmFood.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemFarmFood.java diff --git a/src/com/builtbroken/assemblyline/item/ItemOreDirv.java b/src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemOreDirv.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemOreDirv.java diff --git a/src/com/builtbroken/assemblyline/item/ItemParts.java b/src/main/java/com/builtbroken/assemblyline/item/ItemParts.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemParts.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemParts.java diff --git a/src/com/builtbroken/assemblyline/item/ItemReadoutTools.java b/src/main/java/com/builtbroken/assemblyline/item/ItemReadoutTools.java similarity index 100% rename from src/com/builtbroken/assemblyline/item/ItemReadoutTools.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemReadoutTools.java diff --git a/src/com/builtbroken/assemblyline/item/ItemWrench.java b/src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java similarity index 93% rename from src/com/builtbroken/assemblyline/item/ItemWrench.java rename to src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java index 6a3240ee2..c1c5bd2c8 100644 --- a/src/com/builtbroken/assemblyline/item/ItemWrench.java +++ b/src/main/java/com/builtbroken/assemblyline/item/ItemWrench.java @@ -1,6 +1,5 @@ package com.builtbroken.assemblyline.item; -import universalelectricity.api.vector.Vector3; import ic2.api.tile.IWrenchable; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -11,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import universalelectricity.api.vector.Vector3; import buildcraft.api.tools.IToolWrench; import com.builtbroken.assemblyline.AssemblyLine; @@ -33,7 +33,7 @@ public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { TileEntity tile = world.getBlockTileEntity(x, y, z); Block block = Block.blocksList[world.getBlockId(x, y, z)]; @@ -58,22 +58,17 @@ public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo else if (((IWrenchable) tile).wrenchCanRemove(player)) { ItemStack output = ((IWrenchable) tile).getWrenchDrop(player); - if(output != null) + if (output != null) { world.setBlockToAir(x, y, z); - DarksHelper.dropItemStack(world, new Vector3(x,y,z), output, false); + DarksHelper.dropItemStack(world, new Vector3(x, y, z), output, false); } } + return true; } return false; } - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { - return false; - } - @Override public boolean shouldPassSneakingClickToBlock(World world, int x, int y, int z) { diff --git a/src/com/builtbroken/assemblyline/machine/BlockCrate.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockCrate.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockCrate.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockDebug.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockDebug.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockDebug.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockDebug.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockDetector.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockDetector.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockDetector.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockDetector.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockEnergyStorage.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockManipulator.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockManipulator.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockManipulator.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockMechanicalGenerator.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockRejector.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockRejector.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockRejector.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockRejector.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockReleaseValve.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockReleaseValve.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockReleaseValve.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockRod.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockRod.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockRod.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockRod.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockSink.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockSink.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockSink.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockSink.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockSteamPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockSteamPiston.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockSteamPiston.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockTank.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockTank.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockTank.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockTransformer.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockTransformer.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockTransformer.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockTransformer.java diff --git a/src/com/builtbroken/assemblyline/machine/BlockTurntable.java b/src/main/java/com/builtbroken/assemblyline/machine/BlockTurntable.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/BlockTurntable.java rename to src/main/java/com/builtbroken/assemblyline/machine/BlockTurntable.java diff --git a/src/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java b/src/main/java/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java rename to src/main/java/com/builtbroken/assemblyline/machine/ContainerBatteryBox.java diff --git a/src/com/builtbroken/assemblyline/machine/ContainerFilter.java b/src/main/java/com/builtbroken/assemblyline/machine/ContainerFilter.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ContainerFilter.java rename to src/main/java/com/builtbroken/assemblyline/machine/ContainerFilter.java diff --git a/src/com/builtbroken/assemblyline/machine/InventoryCrate.java b/src/main/java/com/builtbroken/assemblyline/machine/InventoryCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/InventoryCrate.java rename to src/main/java/com/builtbroken/assemblyline/machine/InventoryCrate.java diff --git a/src/com/builtbroken/assemblyline/machine/ItemBlockCrate.java b/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ItemBlockCrate.java rename to src/main/java/com/builtbroken/assemblyline/machine/ItemBlockCrate.java diff --git a/src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java b/src/main/java/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java rename to src/main/java/com/builtbroken/assemblyline/machine/ItemBlockEnergyStorage.java diff --git a/src/com/builtbroken/assemblyline/machine/ItemFluidCan.java b/src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ItemFluidCan.java rename to src/main/java/com/builtbroken/assemblyline/machine/ItemFluidCan.java diff --git a/src/com/builtbroken/assemblyline/machine/ItemStorageCan.java b/src/main/java/com/builtbroken/assemblyline/machine/ItemStorageCan.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/ItemStorageCan.java rename to src/main/java/com/builtbroken/assemblyline/machine/ItemStorageCan.java diff --git a/src/com/builtbroken/assemblyline/machine/NetworkAssembly.java b/src/main/java/com/builtbroken/assemblyline/machine/NetworkAssembly.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/NetworkAssembly.java rename to src/main/java/com/builtbroken/assemblyline/machine/NetworkAssembly.java diff --git a/src/com/builtbroken/assemblyline/machine/PathfinderCrate.java b/src/main/java/com/builtbroken/assemblyline/machine/PathfinderCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/PathfinderCrate.java rename to src/main/java/com/builtbroken/assemblyline/machine/PathfinderCrate.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java similarity index 95% rename from src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java index 121d53227..97a27a352 100644 --- a/src/com/builtbroken/assemblyline/machine/TileEntityAssembly.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityAssembly.java @@ -165,6 +165,18 @@ public abstract class TileEntityAssembly extends TileEntityEnergyMachine impleme return ((NetworkSharedPower) this.getTileNetwork()).getEnergyCapacity(); } + @Override + public long getEnergy(ForgeDirection from) + { + return this.getEnergyStored(); + } + + @Override + public long getEnergyCapacity(ForgeDirection from) + { + return this.getMaxEnergyStored(); + } + @Override public long getPartEnergy() { diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityBatteryBox.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityCrate.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityCrate.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityCrate.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityCrate.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityDetector.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityDetector.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityDetector.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityDetector.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityGenerator.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityGenerator.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityGenerator.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfFluid.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfLoad.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityInfSupply.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityManipulator.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityManipulator.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityManipulator.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityRejector.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityRejector.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityRejector.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityRejector.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityReleaseValve.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntitySink.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySink.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntitySink.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntitySink.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntitySteamPiston.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityTank.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityTank.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityTank.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityTank.java diff --git a/src/com/builtbroken/assemblyline/machine/TileEntityVoid.java b/src/main/java/com/builtbroken/assemblyline/machine/TileEntityVoid.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/TileEntityVoid.java rename to src/main/java/com/builtbroken/assemblyline/machine/TileEntityVoid.java diff --git a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java rename to src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyor.java diff --git a/src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java rename to src/main/java/com/builtbroken/assemblyline/machine/belt/BlockConveyorBelt.java diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java rename to src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyor.java diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java rename to src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityConveyorBelt.java diff --git a/src/com/builtbroken/assemblyline/machine/belt/TileEntityElevatorBelt.java b/src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityElevatorBelt.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/belt/TileEntityElevatorBelt.java rename to src/main/java/com/builtbroken/assemblyline/machine/belt/TileEntityElevatorBelt.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/BlockEncoder.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/ContainerEncoder.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/IInventoryWatcher.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/ItemDisk.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDisk.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/SlotDiskResult.java diff --git a/src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java b/src/main/java/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java rename to src/main/java/com/builtbroken/assemblyline/machine/encoder/TileEntityEncoder.java diff --git a/src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java b/src/main/java/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java rename to src/main/java/com/builtbroken/assemblyline/machine/processor/BlockProcessor.java diff --git a/src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java b/src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java rename to src/main/java/com/builtbroken/assemblyline/machine/processor/ContainerProcessor.java diff --git a/src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java b/src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java rename to src/main/java/com/builtbroken/assemblyline/machine/processor/TileEntityProcessor.java diff --git a/src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java b/src/main/java/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java rename to src/main/java/com/builtbroken/assemblyline/machine/red/BlockAdvancedHopper.java diff --git a/src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java b/src/main/java/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java rename to src/main/java/com/builtbroken/assemblyline/machine/red/BlockPistonPlus.java diff --git a/src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java b/src/main/java/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java rename to src/main/java/com/builtbroken/assemblyline/machine/red/TileEntityAdvancedHopper.java diff --git a/src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java b/src/main/java/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java similarity index 100% rename from src/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java rename to src/main/java/com/builtbroken/assemblyline/machine/red/TileEntityPistonPlus.java diff --git a/src/com/builtbroken/assemblyline/multipart/ItemMultipartBase.java b/src/main/java/com/builtbroken/assemblyline/multipart/ItemMultipartBase.java similarity index 100% rename from src/com/builtbroken/assemblyline/multipart/ItemMultipartBase.java rename to src/main/java/com/builtbroken/assemblyline/multipart/ItemMultipartBase.java diff --git a/src/com/builtbroken/assemblyline/multipart/ItemWire.java b/src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/multipart/ItemWire.java rename to src/main/java/com/builtbroken/assemblyline/multipart/ItemWire.java diff --git a/src/com/builtbroken/assemblyline/multipart/MultipartAL.java b/src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java similarity index 100% rename from src/com/builtbroken/assemblyline/multipart/MultipartAL.java rename to src/main/java/com/builtbroken/assemblyline/multipart/MultipartAL.java diff --git a/src/com/builtbroken/assemblyline/multipart/PartBasicWire.java b/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java similarity index 83% rename from src/com/builtbroken/assemblyline/multipart/PartBasicWire.java rename to src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java index 36227969d..43c90d569 100644 --- a/src/com/builtbroken/assemblyline/multipart/PartBasicWire.java +++ b/src/main/java/com/builtbroken/assemblyline/multipart/PartBasicWire.java @@ -1,5 +1,6 @@ package com.builtbroken.assemblyline.multipart; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.CompatibilityModule; @@ -18,6 +19,8 @@ public class PartBasicWire extends PartAdvanced implements IConductor protected Object[] connections = new Object[6]; + private long saveBuffer = 0; + /** Universal Electricity conductor functions. */ @Override public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive) @@ -124,7 +127,7 @@ public class PartBasicWire extends PartAdvanced implements IConductor } @Override - public long getTransferCapacity() + public long getCurrentCapacity() { return 100000; } @@ -134,4 +137,32 @@ public class PartBasicWire extends PartAdvanced implements IConductor { return "assembly_line_basic_wire"; } + + @Override + public long getSavedBuffer() + { + return this.saveBuffer; + } + + @Override + public void setSaveBuffer(long energy) + { + this.saveBuffer = energy; + } + + /** NBT Data */ + @Override + public void load(NBTTagCompound nbt) + { + super.load(nbt); + this.saveBuffer = nbt.getLong("saveBuffer"); + } + + /** Writes a tile entity to NBT. */ + @Override + public void save(NBTTagCompound nbt) + { + super.save(nbt); + nbt.setLong("saveBuffer", this.saveBuffer); + } } \ No newline at end of file diff --git a/src/main/java/com/builtbroken/assemblyline/multipart/TraitConductor.java b/src/main/java/com/builtbroken/assemblyline/multipart/TraitConductor.java new file mode 100644 index 000000000..892b50fbd --- /dev/null +++ b/src/main/java/com/builtbroken/assemblyline/multipart/TraitConductor.java @@ -0,0 +1,179 @@ +package com.builtbroken.assemblyline.multipart; + +import java.util.HashSet; +import java.util.Set; + +import net.minecraftforge.common.ForgeDirection; +import universalelectricity.api.energy.IConductor; +import universalelectricity.api.energy.IEnergyNetwork; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; + +public class TraitConductor extends TileMultipart implements IConductor +{ + public Set interfaces = new HashSet(); + + @Override + public void copyFrom(TileMultipart that) + { + super.copyFrom(that); + + if (that instanceof TraitConductor) + { + this.interfaces = ((TraitConductor) that).interfaces; + } + } + + @Override + public void bindPart(TMultiPart part) + { + super.bindPart(part); + + if (part instanceof IConductor) + { + this.interfaces.add((IConductor) part); + } + } + + @Override + public void partRemoved(TMultiPart part, int p) + { + super.partRemoved(part, p); + + if (part instanceof IConductor) + { + this.interfaces.remove(part); + } + } + + @Override + public void clearParts() + { + super.clearParts(); + this.interfaces.clear(); + } + + @Override + public Object[] getConnections() + { + for (IConductor conductor : this.interfaces) + { + return conductor.getConnections(); + } + + return null; + } + + @Override + public IEnergyNetwork getNetwork() + { + for (IConductor conductor : this.interfaces) + { + return conductor.getNetwork(); + } + + return null; + } + + @Override + public void setNetwork(IEnergyNetwork network) + { + for (IConductor conductor : this.interfaces) + { + conductor.setNetwork(network); + } + } + + @Override + public boolean canConnect(ForgeDirection direction) + { + for (IConductor conductor : this.interfaces) + { + if (conductor.canConnect(direction)) + { + return true; + } + } + + return false; + } + + @Override + public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive) + { + /** Try out different sides to try to inject energy into. */ + if (this.partMap(from.ordinal()) == null) + { + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + { + if (dir != from.getOpposite()) + { + TMultiPart part = this.partMap(dir.ordinal()); + + if (this.interfaces.contains(part)) + { + return ((IConductor) part).onReceiveEnergy(from, receive, doReceive); + } + } + } + } + + return 0; + } + + @Override + public long onExtractEnergy(ForgeDirection from, long extract, boolean doExtract) + { + return 0; + } + + @Override + public float getResistance() + { + long energyLoss = 0; + + if (this.interfaces.size() > 0) + { + for (IConductor conductor : this.interfaces) + { + energyLoss += conductor.getResistance(); + } + + energyLoss /= this.interfaces.size(); + } + + return energyLoss; + } + + @Override + public long getCurrentCapacity() + { + long capacitance = 0; + + if (this.interfaces.size() > 0) + { + for (IConductor conductor : this.interfaces) + { + capacitance += conductor.getCurrentCapacity(); + } + + capacitance /= this.interfaces.size(); + } + + return capacitance; + } + + @Override + public long getSavedBuffer() + { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void setSaveBuffer(long energy) + { + // TODO Auto-generated method stub + + } +} \ No newline at end of file diff --git a/src/com/builtbroken/assemblyline/transmit/BlockWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/BlockWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/transmit/BlockWire.java rename to src/main/java/com/builtbroken/assemblyline/transmit/BlockWire.java diff --git a/src/com/builtbroken/assemblyline/transmit/ItemBlockWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/ItemBlockWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/transmit/ItemBlockWire.java rename to src/main/java/com/builtbroken/assemblyline/transmit/ItemBlockWire.java diff --git a/src/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java rename to src/main/java/com/builtbroken/assemblyline/transmit/TileEntityDetectorWire.java diff --git a/src/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java similarity index 100% rename from src/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java rename to src/main/java/com/builtbroken/assemblyline/transmit/TileEntitySwitchWire.java diff --git a/src/com/builtbroken/assemblyline/transmit/TileEntityWire.java b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java similarity index 87% rename from src/com/builtbroken/assemblyline/transmit/TileEntityWire.java rename to src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java index cca94221e..e344dc2f3 100644 --- a/src/com/builtbroken/assemblyline/transmit/TileEntityWire.java +++ b/src/main/java/com/builtbroken/assemblyline/transmit/TileEntityWire.java @@ -1,16 +1,19 @@ package com.builtbroken.assemblyline.transmit; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import universalelectricity.api.CompatibilityModule; +import universalelectricity.api.UniversalClass; import universalelectricity.api.energy.EnergyNetworkLoader; import universalelectricity.api.energy.IConductor; import universalelectricity.api.energy.IEnergyNetwork; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorHelper; +import com.builtbroken.assemblyline.machine.belt.TileEntityConveyor.SlantType; import com.builtbroken.minecraft.DarkCore; import com.builtbroken.minecraft.helpers.ColorCode; import com.builtbroken.minecraft.helpers.ColorCode.IColorCoded; @@ -23,6 +26,7 @@ import cpw.mods.fml.common.network.Player; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@UniversalClass public class TileEntityWire extends TileEntityAdvanced implements IConductor, ISimplePacketReceiver, IColorCoded { protected int updateTick = 1; @@ -34,6 +38,8 @@ public class TileEntityWire extends TileEntityAdvanced implements IConductor, IS public byte currentAcceptorConnections = 0x00; + private long saveBuffer = 0; + @Override public void updateEntity() { @@ -198,8 +204,36 @@ public class TileEntityWire extends TileEntityAdvanced implements IConductor, IS } @Override - public long getTransferCapacity() + public long getCurrentCapacity() { return 1000000; } + + @Override + public long getSavedBuffer() + { + return this.saveBuffer; + } + + @Override + public void setSaveBuffer(long energy) + { + this.saveBuffer = energy; + } + + /** NBT Data */ + @Override + public void readFromNBT(NBTTagCompound nbt) + { + super.readFromNBT(nbt); + this.saveBuffer = nbt.getLong("saveBuffer"); + } + + /** Writes a tile entity to NBT. */ + @Override + public void writeToNBT(NBTTagCompound nbt) + { + super.writeToNBT(nbt); + nbt.setLong("saveBuffer", this.saveBuffer); + } } diff --git a/src/com/builtbroken/assemblyline/worldgen/OreGenBase.java b/src/main/java/com/builtbroken/assemblyline/worldgen/OreGenBase.java similarity index 100% rename from src/com/builtbroken/assemblyline/worldgen/OreGenBase.java rename to src/main/java/com/builtbroken/assemblyline/worldgen/OreGenBase.java diff --git a/src/com/builtbroken/assemblyline/worldgen/OreGenReplace.java b/src/main/java/com/builtbroken/assemblyline/worldgen/OreGenReplace.java similarity index 100% rename from src/com/builtbroken/assemblyline/worldgen/OreGenReplace.java rename to src/main/java/com/builtbroken/assemblyline/worldgen/OreGenReplace.java diff --git a/src/com/builtbroken/assemblyline/worldgen/OreGenReplaceStone.java b/src/main/java/com/builtbroken/assemblyline/worldgen/OreGenReplaceStone.java similarity index 100% rename from src/com/builtbroken/assemblyline/worldgen/OreGenReplaceStone.java rename to src/main/java/com/builtbroken/assemblyline/worldgen/OreGenReplaceStone.java diff --git a/src/com/builtbroken/assemblyline/worldgen/OreGenerator.java b/src/main/java/com/builtbroken/assemblyline/worldgen/OreGenerator.java similarity index 100% rename from src/com/builtbroken/assemblyline/worldgen/OreGenerator.java rename to src/main/java/com/builtbroken/assemblyline/worldgen/OreGenerator.java diff --git a/tools/blockSorterTest/README.txt b/src/tools/blockSorterTest/README.txt similarity index 100% rename from tools/blockSorterTest/README.txt rename to src/tools/blockSorterTest/README.txt diff --git a/tools/blockSorterTest/co/Main.java b/src/tools/blockSorterTest/co/Main.java similarity index 100% rename from tools/blockSorterTest/co/Main.java rename to src/tools/blockSorterTest/co/Main.java