From 3c0a93ed228c1e6e5552bcd6048007234967ec3c Mon Sep 17 00:00:00 2001 From: Rseifert Date: Sat, 2 Feb 2013 19:36:19 -0500 Subject: [PATCH] Moved -> Files & Fixed API This screws up the history tab but save me soo much time --- .gitignore | 181 ++---------------- buildnumber.txt | 1 + info.txt | 14 ++ modversion.txt | 1 + recommendedversion.txt | 1 + .../liquidmechanics/api/IColorCoded.java | 0 .../liquidmechanics/api/IHeatCreator.java | 0 .../minecraft}/liquidmechanics/api/IPipe.java | 0 .../liquidmechanics/api/IReadOut.java | 0 .../api/helpers/ColorCode.java | 0 .../api/helpers/connectionHelper.java | 0 .../api/liquids/IPressure.java | 0 .../api/liquids/LiquidData.java | 0 .../api/liquids/LiquidFiniteFlowing.java | 0 .../api/liquids/LiquidFiniteStill.java | 0 .../api/liquids/LiquidHandler.java | 36 ++-- .../liquidmechanics/api/mech/IForce.java | 0 .../liquidmechanics/client/ClientProxy.java | 0 .../client/gui/GuiReleaseValve.java | 0 .../client/model/ModelGearRod.java | 0 .../client/model/ModelGenerator.java | 0 .../client/model/ModelLargePipe.java | 0 .../client/model/ModelLiquidTank.java | 0 .../client/model/ModelLiquidTankCorner.java | 0 .../client/model/ModelPump.java | 0 .../client/model/ModelReleaseValve.java | 0 .../client/model/ModelSink.java | 0 .../client/render/BlockRenderHelper.java | 0 .../client/render/ItemRenderHelper.java | 0 .../client/render/RenderGearRod.java | 0 .../client/render/RenderGenerator.java | 0 .../client/render/RenderPipe.java | 0 .../client/render/RenderPump.java | 0 .../client/render/RenderReleaseValve.java | 0 .../client/render/RenderRotation.java | 0 .../client/render/RenderSink.java | 0 .../client/render/RenderTank.java | 0 .../liquidmechanics/common/CommonProxy.java | 0 .../common/LiquidMechanics.java | 26 ++- .../liquidmechanics/common/MetaGroup.java | 0 .../common/TabLiquidMechanics.java | 0 .../common/block/BlockGenerator.java | 0 .../common/block/BlockPipe.java | 0 .../common/block/BlockPumpMachine.java | 0 .../common/block/BlockReleaseValve.java | 0 .../common/block/BlockRod.java | 0 .../common/block/BlockSink.java | 0 .../common/block/BlockTank.java | 0 .../common/block/BlockWasteLiquid.java | 0 .../common/block/liquids/BlockMilk.java | 0 .../common/block/liquids/BlockOil.java | 0 .../common/block/liquids/BlockOilFlowing.java | 0 .../common/handlers/UpdateConverter.java | 0 .../common/item/ItemGuage.java | 0 .../common/item/ItemLiquidMachine.java | 0 .../common/item/ItemParts.java | 0 .../liquidmechanics/common/item/ItemPipe.java | 0 .../common/item/ItemReleaseValve.java | 0 .../liquidmechanics/common/item/ItemTank.java | 0 .../common/item/ItemValve.java | 0 .../tileentity/ContainerReleaseValve.java | 0 .../tileentity/TileEntityGenerator.java | 0 .../common/tileentity/TileEntityMachine.java | 0 .../common/tileentity/TileEntityPipe.java | 1 - .../common/tileentity/TileEntityPump.java | 0 .../tileentity/TileEntityReleaseValve.java | 0 .../common/tileentity/TileEntityRod.java | 0 .../common/tileentity/TileEntitySink.java | 0 .../common/tileentity/TileEntityTank.java | 0 .../liquidmechanics/resource/ReleaseValve.png | Bin .../liquidmechanics/resource/Sink.png | Bin .../liquidmechanics/resource/blocks.png | Bin .../liquidmechanics/resource/blue.png | Bin .../resource/gear_shaft_piston.png | Bin .../liquidmechanics/resource/items.png | Bin .../resource/lang/en_US.properties | 0 .../resource/mechanical/GearRod.png | Bin .../resource/mechanical/Generator.png | Bin .../resource/pipes/BlackPipe.png | Bin .../resource/pipes/BluePipe.png | Bin .../resource/pipes/BrownPipe.png | Bin .../resource/pipes/CyanPipe.png | Bin .../resource/pipes/GreenPipe.png | Bin .../resource/pipes/GreyPipe.png | Bin .../resource/pipes/LightBluePipe.png | Bin .../resource/pipes/LimePipe.png | Bin .../resource/pipes/MagentaPipe.png | Bin .../resource/pipes/OrangePipe.png | Bin .../resource/pipes/PinkPipe.png | Bin .../liquidmechanics/resource/pipes/Pipe.png | Bin .../resource/pipes/PurplePipe.png | Bin .../resource/pipes/RedPipe.png | Bin .../resource/pipes/SilverPipe.png | Bin .../resource/pipes/WhitePipe.png | Bin .../resource/pipes/YellowPipe.png | Bin .../resource/pumps/WaterPump.png | Bin .../liquidmechanics/resource/tanks/Corner.png | Bin .../resource/tanks/CornerLava.png | Bin .../resource/tanks/CornerMilk.png | Bin .../resource/tanks/CornerWater.png | Bin .../resource/tanks/LavaTank.png | Bin .../resource/tanks/MilkTank.png | Bin .../resource/tanks/SteamTank.png | Bin .../liquidmechanics/resource/tanks/Tank.png | Bin .../liquidmechanics/resource/tanks/Tank2.png | Bin .../resource/tanks/WaterTank.png | Bin .../resource/tanks/guage/0.png | Bin .../resource/tanks/guage/0Fuel.png | Bin .../resource/tanks/guage/0Lava.png | Bin .../resource/tanks/guage/1.png | Bin .../resource/tanks/guage/1Fuel.png | Bin .../resource/tanks/guage/1Lava.png | Bin .../resource/tanks/guage/2.png | Bin .../resource/tanks/guage/2Fuel.png | Bin .../resource/tanks/guage/2Lava.png | Bin .../resource/tanks/guage/3.png | Bin .../resource/tanks/guage/3Fuel.png | Bin .../resource/tanks/guage/3Lava.png | Bin .../resource/tanks/guage/4.png | Bin .../resource/tanks/guage/4Fuel.png | Bin .../resource/tanks/guage/4Lava.png | Bin 121 files changed, 80 insertions(+), 181 deletions(-) create mode 100644 buildnumber.txt create mode 100644 info.txt create mode 100644 modversion.txt create mode 100644 recommendedversion.txt rename {minecraft => src/minecraft}/liquidmechanics/api/IColorCoded.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/IHeatCreator.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/IPipe.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/IReadOut.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/helpers/ColorCode.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/helpers/connectionHelper.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/liquids/IPressure.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/liquids/LiquidData.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/liquids/LiquidFiniteFlowing.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/liquids/LiquidFiniteStill.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/api/liquids/LiquidHandler.java (82%) rename {minecraft => src/minecraft}/liquidmechanics/api/mech/IForce.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/ClientProxy.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/gui/GuiReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelGearRod.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelGenerator.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelLargePipe.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelLiquidTank.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelLiquidTankCorner.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelPump.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/model/ModelSink.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/BlockRenderHelper.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/ItemRenderHelper.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderGearRod.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderGenerator.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderPipe.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderPump.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderRotation.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderSink.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/client/render/RenderTank.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/CommonProxy.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/LiquidMechanics.java (95%) rename {minecraft => src/minecraft}/liquidmechanics/common/MetaGroup.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/TabLiquidMechanics.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockGenerator.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockPipe.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockPumpMachine.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockRod.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockSink.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockTank.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/BlockWasteLiquid.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/liquids/BlockMilk.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/liquids/BlockOil.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/block/liquids/BlockOilFlowing.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/handlers/UpdateConverter.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemGuage.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemLiquidMachine.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemParts.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemPipe.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemTank.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/item/ItemValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/ContainerReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityGenerator.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityMachine.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityPipe.java (99%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityPump.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityReleaseValve.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityRod.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntitySink.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/common/tileentity/TileEntityTank.java (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/ReleaseValve.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/Sink.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/blocks.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/blue.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/gear_shaft_piston.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/items.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/lang/en_US.properties (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/mechanical/GearRod.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/mechanical/Generator.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/BlackPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/BluePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/BrownPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/CyanPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/GreenPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/GreyPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/LightBluePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/LimePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/MagentaPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/OrangePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/PinkPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/Pipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/PurplePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/RedPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/SilverPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/WhitePipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pipes/YellowPipe.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/pumps/WaterPump.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/Corner.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/CornerLava.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/CornerMilk.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/CornerWater.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/LavaTank.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/MilkTank.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/SteamTank.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/Tank.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/Tank2.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/WaterTank.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/0.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/0Fuel.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/0Lava.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/1.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/1Fuel.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/1Lava.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/2.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/2Fuel.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/2Lava.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/3.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/3Fuel.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/3Lava.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/4.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/4Fuel.png (100%) rename {minecraft => src/minecraft}/liquidmechanics/resource/tanks/guage/4Lava.png (100%) diff --git a/.gitignore b/.gitignore index 5ebd21a1..9f81c460 100644 --- a/.gitignore +++ b/.gitignore @@ -1,163 +1,20 @@ -################# -## Eclipse -################# +*.bat +*.sh +*.db +*.exe +/*/ +LICENSE.txt +CHANGELOG -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap -.DS_Store +!/src/ +/src/minecraft/* +!/src/minecraft/liquidmechanics/ +!/resources/ +!/models/ +!info.txt +!AssemblyLineStandard.xml +!publish.bat +!publish_obf.bat +!include.bat +!buildlocal.bat +!/README \ No newline at end of file diff --git a/buildnumber.txt b/buildnumber.txt new file mode 100644 index 00000000..3597e237 --- /dev/null +++ b/buildnumber.txt @@ -0,0 +1 @@ +14 diff --git a/info.txt b/info.txt new file mode 100644 index 00000000..61c37551 --- /dev/null +++ b/info.txt @@ -0,0 +1,14 @@ +@ Fluid-Mechanics_v0.2.4.1.jar Fluid-Mechanics_v0.2.4.1_api.zip +@ Fluid-Mechanics_v0.2.4.2.jar Fluid-Mechanics_v0.2.4.2_api.zip +@ Fluid-Mechanics_v0.2.5.3.jar Fluid-Mechanics_v0.2.5.3_api.zip +@ Fluid-Mechanics_v0.2.5.4.jar Fluid-Mechanics_v0.2.5.4_api.zip +@ Fluid-Mechanics_v0.2.5.5.jar Fluid-Mechanics_v0.2.5.5_api.zip +x Fluid-Mechanics_v0.2.5.6.jar Fluid-Mechanics_v0.2.5.6_api.zip +@ Fluid-Mechanics_v0.2.5.7.jar Fluid-Mechanics_v0.2.5.7_api.zip +@ Fluid-Mechanics_v0.2.5.8.jar Fluid-Mechanics_v0.2.5.8_api.zip +@ Fluid-Mechanics_v0.2.5.9.jar Fluid-Mechanics_v0.2.5.9_api.zip +@ Fluid-Mechanics_v0.2.5.10.jar Fluid-Mechanics_v0.2.5.10_api.zip +@ Fluid-Mechanics_v0.2.5.11.jar Fluid-Mechanics_v0.2.5.11_api.zip +@ Fluid-Mechanics_v0.2.6.12.jar Fluid-Mechanics_v0.2.6.12_api.zip +@ Fluid-Mechanics_v0.2.6.13.jar Fluid-Mechanics_v0.2.6.13_api.zip +* Fluid-Mechanics_v0.2.6.14.jar Fluid-Mechanics_v0.2.6.14_api.zip diff --git a/modversion.txt b/modversion.txt new file mode 100644 index 00000000..a53741c0 --- /dev/null +++ b/modversion.txt @@ -0,0 +1 @@ +0.2.6 \ No newline at end of file diff --git a/recommendedversion.txt b/recommendedversion.txt new file mode 100644 index 00000000..a96f13d2 --- /dev/null +++ b/recommendedversion.txt @@ -0,0 +1 @@ +0.2.6 diff --git a/minecraft/liquidmechanics/api/IColorCoded.java b/src/minecraft/liquidmechanics/api/IColorCoded.java similarity index 100% rename from minecraft/liquidmechanics/api/IColorCoded.java rename to src/minecraft/liquidmechanics/api/IColorCoded.java diff --git a/minecraft/liquidmechanics/api/IHeatCreator.java b/src/minecraft/liquidmechanics/api/IHeatCreator.java similarity index 100% rename from minecraft/liquidmechanics/api/IHeatCreator.java rename to src/minecraft/liquidmechanics/api/IHeatCreator.java diff --git a/minecraft/liquidmechanics/api/IPipe.java b/src/minecraft/liquidmechanics/api/IPipe.java similarity index 100% rename from minecraft/liquidmechanics/api/IPipe.java rename to src/minecraft/liquidmechanics/api/IPipe.java diff --git a/minecraft/liquidmechanics/api/IReadOut.java b/src/minecraft/liquidmechanics/api/IReadOut.java similarity index 100% rename from minecraft/liquidmechanics/api/IReadOut.java rename to src/minecraft/liquidmechanics/api/IReadOut.java diff --git a/minecraft/liquidmechanics/api/helpers/ColorCode.java b/src/minecraft/liquidmechanics/api/helpers/ColorCode.java similarity index 100% rename from minecraft/liquidmechanics/api/helpers/ColorCode.java rename to src/minecraft/liquidmechanics/api/helpers/ColorCode.java diff --git a/minecraft/liquidmechanics/api/helpers/connectionHelper.java b/src/minecraft/liquidmechanics/api/helpers/connectionHelper.java similarity index 100% rename from minecraft/liquidmechanics/api/helpers/connectionHelper.java rename to src/minecraft/liquidmechanics/api/helpers/connectionHelper.java diff --git a/minecraft/liquidmechanics/api/liquids/IPressure.java b/src/minecraft/liquidmechanics/api/liquids/IPressure.java similarity index 100% rename from minecraft/liquidmechanics/api/liquids/IPressure.java rename to src/minecraft/liquidmechanics/api/liquids/IPressure.java diff --git a/minecraft/liquidmechanics/api/liquids/LiquidData.java b/src/minecraft/liquidmechanics/api/liquids/LiquidData.java similarity index 100% rename from minecraft/liquidmechanics/api/liquids/LiquidData.java rename to src/minecraft/liquidmechanics/api/liquids/LiquidData.java diff --git a/minecraft/liquidmechanics/api/liquids/LiquidFiniteFlowing.java b/src/minecraft/liquidmechanics/api/liquids/LiquidFiniteFlowing.java similarity index 100% rename from minecraft/liquidmechanics/api/liquids/LiquidFiniteFlowing.java rename to src/minecraft/liquidmechanics/api/liquids/LiquidFiniteFlowing.java diff --git a/minecraft/liquidmechanics/api/liquids/LiquidFiniteStill.java b/src/minecraft/liquidmechanics/api/liquids/LiquidFiniteStill.java similarity index 100% rename from minecraft/liquidmechanics/api/liquids/LiquidFiniteStill.java rename to src/minecraft/liquidmechanics/api/liquids/LiquidFiniteStill.java diff --git a/minecraft/liquidmechanics/api/liquids/LiquidHandler.java b/src/minecraft/liquidmechanics/api/liquids/LiquidHandler.java similarity index 82% rename from minecraft/liquidmechanics/api/liquids/LiquidHandler.java rename to src/minecraft/liquidmechanics/api/liquids/LiquidHandler.java index 70c156d9..59a457ec 100644 --- a/minecraft/liquidmechanics/api/liquids/LiquidHandler.java +++ b/src/minecraft/liquidmechanics/api/liquids/LiquidHandler.java @@ -4,6 +4,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.logging.Logger; + +import cpw.mods.fml.common.FMLLog; import liquidmechanics.api.helpers.ColorCode; @@ -26,50 +29,61 @@ public class LiquidHandler public static LiquidData waste; public static LiquidData milk; - // public static LiquidData oil; TODO add - // public static LiquidData fuel; + public static Logger FMLog = Logger.getLogger("LiquidHandler"); + /** * Called to add the default liquids to the allowed list */ public static void addDefaultLiquids() { + FMLog.setParent(FMLLog.getLogger()); water = new LiquidData("water", LiquidDictionary.getOrCreateLiquid("Water", new LiquidStack(Block.waterStill, 1)), ColorCode.BLUE, false, 60); allowedLiquids.add(water); + lava = new LiquidData("Lava", LiquidDictionary.getOrCreateLiquid("Lava", new LiquidStack(Block.lavaStill, 1)), ColorCode.RED, false, 40); allowedLiquids.add(lava); + unkown = new LiquidData("Unknown", LiquidDictionary.getOrCreateLiquid("Unknown", new LiquidStack(20, 1)), ColorCode.NONE, false, 32); allowedLiquids.add(unkown); + + for(LiquidData data : allowedLiquids) + { + FMLog.info(data.getName() + " registered as a liquid"); + } } @ForgeSubscribe - public void liquidRegisterEvent(LiquidRegisterEvent event) + public void liquidRegisterEvent(LiquidDictionary.LiquidRegisterEvent event) { // TODO use this to add new liquid types to the data list // or something along the lines of IDing liquids for use + FMLog.info("LiquidRegistered: "+event.Name); + FMLog.setParent(FMLLog.getLogger()); if (event.Name.equalsIgnoreCase("methane")) { - this.allowedLiquids.add(new LiquidData("methane", event.Liquid, ColorCode.LIME, true, 100)); + allowedLiquids.add(new LiquidData("methane", event.Liquid, ColorCode.LIME, true, 100)); } else if (event.Name.equalsIgnoreCase("oil")) { - this.allowedLiquids.add(new LiquidData("oil", event.Liquid, ColorCode.BLACK, true, 50)); + allowedLiquids.add(new LiquidData("oil", event.Liquid, ColorCode.BLACK, true, 50)); } else if (event.Name.equalsIgnoreCase("fuel")) { - this.allowedLiquids.add(new LiquidData("fuel", event.Liquid, ColorCode.YELLOW, true, 50)); + allowedLiquids.add(new LiquidData("fuel", event.Liquid, ColorCode.YELLOW, true, 50)); } else if (event.Name.equalsIgnoreCase("steam")) { - this.steam = new LiquidData("steam", event.Liquid, ColorCode.ORANGE, true, 100); + steam = new LiquidData("steam", event.Liquid, ColorCode.ORANGE, true, 100); }else if(event.Name.equalsIgnoreCase("Waste")) { - this.waste = new LiquidData("Waste", event.Liquid, ColorCode.BROWN, false, 40); - this.allowedLiquids.add(waste); + waste = new LiquidData("Waste", event.Liquid, ColorCode.BROWN, false, 40); + allowedLiquids.add(waste); }else if(event.Name.equalsIgnoreCase("Milk")) { - this.milk = new LiquidData("Milk", event.Liquid, ColorCode.WHITE, false, 50); - this.allowedLiquids.add(milk); + milk = new LiquidData("Milk", event.Liquid, ColorCode.WHITE, false, 50); + allowedLiquids.add(milk); + FMLog.warning("FluidMechanics: Milk has been registered"); } } diff --git a/minecraft/liquidmechanics/api/mech/IForce.java b/src/minecraft/liquidmechanics/api/mech/IForce.java similarity index 100% rename from minecraft/liquidmechanics/api/mech/IForce.java rename to src/minecraft/liquidmechanics/api/mech/IForce.java diff --git a/minecraft/liquidmechanics/client/ClientProxy.java b/src/minecraft/liquidmechanics/client/ClientProxy.java similarity index 100% rename from minecraft/liquidmechanics/client/ClientProxy.java rename to src/minecraft/liquidmechanics/client/ClientProxy.java diff --git a/minecraft/liquidmechanics/client/gui/GuiReleaseValve.java b/src/minecraft/liquidmechanics/client/gui/GuiReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/client/gui/GuiReleaseValve.java rename to src/minecraft/liquidmechanics/client/gui/GuiReleaseValve.java diff --git a/minecraft/liquidmechanics/client/model/ModelGearRod.java b/src/minecraft/liquidmechanics/client/model/ModelGearRod.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelGearRod.java rename to src/minecraft/liquidmechanics/client/model/ModelGearRod.java diff --git a/minecraft/liquidmechanics/client/model/ModelGenerator.java b/src/minecraft/liquidmechanics/client/model/ModelGenerator.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelGenerator.java rename to src/minecraft/liquidmechanics/client/model/ModelGenerator.java diff --git a/minecraft/liquidmechanics/client/model/ModelLargePipe.java b/src/minecraft/liquidmechanics/client/model/ModelLargePipe.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelLargePipe.java rename to src/minecraft/liquidmechanics/client/model/ModelLargePipe.java diff --git a/minecraft/liquidmechanics/client/model/ModelLiquidTank.java b/src/minecraft/liquidmechanics/client/model/ModelLiquidTank.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelLiquidTank.java rename to src/minecraft/liquidmechanics/client/model/ModelLiquidTank.java diff --git a/minecraft/liquidmechanics/client/model/ModelLiquidTankCorner.java b/src/minecraft/liquidmechanics/client/model/ModelLiquidTankCorner.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelLiquidTankCorner.java rename to src/minecraft/liquidmechanics/client/model/ModelLiquidTankCorner.java diff --git a/minecraft/liquidmechanics/client/model/ModelPump.java b/src/minecraft/liquidmechanics/client/model/ModelPump.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelPump.java rename to src/minecraft/liquidmechanics/client/model/ModelPump.java diff --git a/minecraft/liquidmechanics/client/model/ModelReleaseValve.java b/src/minecraft/liquidmechanics/client/model/ModelReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelReleaseValve.java rename to src/minecraft/liquidmechanics/client/model/ModelReleaseValve.java diff --git a/minecraft/liquidmechanics/client/model/ModelSink.java b/src/minecraft/liquidmechanics/client/model/ModelSink.java similarity index 100% rename from minecraft/liquidmechanics/client/model/ModelSink.java rename to src/minecraft/liquidmechanics/client/model/ModelSink.java diff --git a/minecraft/liquidmechanics/client/render/BlockRenderHelper.java b/src/minecraft/liquidmechanics/client/render/BlockRenderHelper.java similarity index 100% rename from minecraft/liquidmechanics/client/render/BlockRenderHelper.java rename to src/minecraft/liquidmechanics/client/render/BlockRenderHelper.java diff --git a/minecraft/liquidmechanics/client/render/ItemRenderHelper.java b/src/minecraft/liquidmechanics/client/render/ItemRenderHelper.java similarity index 100% rename from minecraft/liquidmechanics/client/render/ItemRenderHelper.java rename to src/minecraft/liquidmechanics/client/render/ItemRenderHelper.java diff --git a/minecraft/liquidmechanics/client/render/RenderGearRod.java b/src/minecraft/liquidmechanics/client/render/RenderGearRod.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderGearRod.java rename to src/minecraft/liquidmechanics/client/render/RenderGearRod.java diff --git a/minecraft/liquidmechanics/client/render/RenderGenerator.java b/src/minecraft/liquidmechanics/client/render/RenderGenerator.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderGenerator.java rename to src/minecraft/liquidmechanics/client/render/RenderGenerator.java diff --git a/minecraft/liquidmechanics/client/render/RenderPipe.java b/src/minecraft/liquidmechanics/client/render/RenderPipe.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderPipe.java rename to src/minecraft/liquidmechanics/client/render/RenderPipe.java diff --git a/minecraft/liquidmechanics/client/render/RenderPump.java b/src/minecraft/liquidmechanics/client/render/RenderPump.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderPump.java rename to src/minecraft/liquidmechanics/client/render/RenderPump.java diff --git a/minecraft/liquidmechanics/client/render/RenderReleaseValve.java b/src/minecraft/liquidmechanics/client/render/RenderReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderReleaseValve.java rename to src/minecraft/liquidmechanics/client/render/RenderReleaseValve.java diff --git a/minecraft/liquidmechanics/client/render/RenderRotation.java b/src/minecraft/liquidmechanics/client/render/RenderRotation.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderRotation.java rename to src/minecraft/liquidmechanics/client/render/RenderRotation.java diff --git a/minecraft/liquidmechanics/client/render/RenderSink.java b/src/minecraft/liquidmechanics/client/render/RenderSink.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderSink.java rename to src/minecraft/liquidmechanics/client/render/RenderSink.java diff --git a/minecraft/liquidmechanics/client/render/RenderTank.java b/src/minecraft/liquidmechanics/client/render/RenderTank.java similarity index 100% rename from minecraft/liquidmechanics/client/render/RenderTank.java rename to src/minecraft/liquidmechanics/client/render/RenderTank.java diff --git a/minecraft/liquidmechanics/common/CommonProxy.java b/src/minecraft/liquidmechanics/common/CommonProxy.java similarity index 100% rename from minecraft/liquidmechanics/common/CommonProxy.java rename to src/minecraft/liquidmechanics/common/CommonProxy.java diff --git a/minecraft/liquidmechanics/common/LiquidMechanics.java b/src/minecraft/liquidmechanics/common/LiquidMechanics.java similarity index 95% rename from minecraft/liquidmechanics/common/LiquidMechanics.java rename to src/minecraft/liquidmechanics/common/LiquidMechanics.java index 6a9aa949..37c254a2 100644 --- a/minecraft/liquidmechanics/common/LiquidMechanics.java +++ b/src/minecraft/liquidmechanics/common/LiquidMechanics.java @@ -1,6 +1,7 @@ package liquidmechanics.common; import java.io.File; +import java.util.logging.Logger; import liquidmechanics.api.helpers.ColorCode; import liquidmechanics.api.liquids.LiquidData; @@ -40,6 +41,7 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.network.PacketManager; import cpw.mods.fml.common.DummyModContainer; +import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; @@ -66,7 +68,7 @@ public class LiquidMechanics extends DummyModContainer public static final String VERSION = "0.2.6"; // Constants - public static final String NAME = "Liquid Mechanics"; + public static final String NAME = "LiquidMechanics"; public static final String CHANNEL = "liquidMech"; public static final String PATH = "/liquidmechanics/"; @@ -104,13 +106,18 @@ public class LiquidMechanics extends DummyModContainer @Instance(NAME) public static LiquidMechanics instance; + public static Logger FMLog = Logger.getLogger(NAME); + @PreInit public void preInit(FMLPreInitializationEvent event) { + FMLog.setParent(FMLLog.getLogger()); + FMLog.info(this.NAME+": Initializing..."); + MinecraftForge.EVENT_BUS.register(new LiquidHandler()); + instance = this; - CONFIGURATION.load(); - + // Blocks blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt()); blockMachine = new BlockPumpMachine(this.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt()); @@ -141,11 +148,14 @@ public class LiquidMechanics extends DummyModContainer GameRegistry.registerBlock(blockMachine, ItemLiquidMachine.class, "lmMachines"); GameRegistry.registerBlock(blockTank, ItemTank.class, "lmTank"); GameRegistry.registerBlock(blockSink, "lmSink"); + + } @Init public void Init(FMLInitializationEvent event) { + FMLog.info(this.NAME+": Loading..."); proxy.Init(); // TileEntities GameRegistry.registerTileEntity(TileEntityPipe.class, "lmPipeTile"); @@ -155,14 +165,15 @@ public class LiquidMechanics extends DummyModContainer GameRegistry.registerTileEntity(TileEntityTank.class, "lmTank"); GameRegistry.registerTileEntity(TileEntityGenerator.class, "lmGen"); GameRegistry.registerTileEntity(TileEntitySink.class, "lmSink"); - System.out.println("Fluid Mechanics Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); - MinecraftForge.EVENT_BUS.register(LiquidHandler.class); + FMLog.info("Fluid Mechanics Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); + } @PostInit public void PostInit(FMLPostInitializationEvent event) { + FMLog.info(this.NAME+": Finalizing..."); proxy.postInit(); TabLiquidMechanics.setItemStack(new ItemStack(blockPipe, 1, 4)); // generator @@ -309,8 +320,9 @@ public class LiquidMechanics extends DummyModContainer OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal())); OreDictionary.registerOre("unfinishedTank", new ItemStack(itemParts, 1, Parts.Tank.ordinal())); // add Default Liquids to current list, done last to let other mods use - // there liquid data first if used - LiquidHandler.addDefaultLiquids(); + // there liquid data first if used LiquidStack waste = LiquidDictionary.getOrCreateLiquid("Waste", new LiquidStack(LiquidMechanics.blockWasteLiquid, 1)); + LiquidHandler.addDefaultLiquids(); + FMLog.info(this.NAME+": Done Loading"); } } diff --git a/minecraft/liquidmechanics/common/MetaGroup.java b/src/minecraft/liquidmechanics/common/MetaGroup.java similarity index 100% rename from minecraft/liquidmechanics/common/MetaGroup.java rename to src/minecraft/liquidmechanics/common/MetaGroup.java diff --git a/minecraft/liquidmechanics/common/TabLiquidMechanics.java b/src/minecraft/liquidmechanics/common/TabLiquidMechanics.java similarity index 100% rename from minecraft/liquidmechanics/common/TabLiquidMechanics.java rename to src/minecraft/liquidmechanics/common/TabLiquidMechanics.java diff --git a/minecraft/liquidmechanics/common/block/BlockGenerator.java b/src/minecraft/liquidmechanics/common/block/BlockGenerator.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockGenerator.java rename to src/minecraft/liquidmechanics/common/block/BlockGenerator.java diff --git a/minecraft/liquidmechanics/common/block/BlockPipe.java b/src/minecraft/liquidmechanics/common/block/BlockPipe.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockPipe.java rename to src/minecraft/liquidmechanics/common/block/BlockPipe.java diff --git a/minecraft/liquidmechanics/common/block/BlockPumpMachine.java b/src/minecraft/liquidmechanics/common/block/BlockPumpMachine.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockPumpMachine.java rename to src/minecraft/liquidmechanics/common/block/BlockPumpMachine.java diff --git a/minecraft/liquidmechanics/common/block/BlockReleaseValve.java b/src/minecraft/liquidmechanics/common/block/BlockReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockReleaseValve.java rename to src/minecraft/liquidmechanics/common/block/BlockReleaseValve.java diff --git a/minecraft/liquidmechanics/common/block/BlockRod.java b/src/minecraft/liquidmechanics/common/block/BlockRod.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockRod.java rename to src/minecraft/liquidmechanics/common/block/BlockRod.java diff --git a/minecraft/liquidmechanics/common/block/BlockSink.java b/src/minecraft/liquidmechanics/common/block/BlockSink.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockSink.java rename to src/minecraft/liquidmechanics/common/block/BlockSink.java diff --git a/minecraft/liquidmechanics/common/block/BlockTank.java b/src/minecraft/liquidmechanics/common/block/BlockTank.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockTank.java rename to src/minecraft/liquidmechanics/common/block/BlockTank.java diff --git a/minecraft/liquidmechanics/common/block/BlockWasteLiquid.java b/src/minecraft/liquidmechanics/common/block/BlockWasteLiquid.java similarity index 100% rename from minecraft/liquidmechanics/common/block/BlockWasteLiquid.java rename to src/minecraft/liquidmechanics/common/block/BlockWasteLiquid.java diff --git a/minecraft/liquidmechanics/common/block/liquids/BlockMilk.java b/src/minecraft/liquidmechanics/common/block/liquids/BlockMilk.java similarity index 100% rename from minecraft/liquidmechanics/common/block/liquids/BlockMilk.java rename to src/minecraft/liquidmechanics/common/block/liquids/BlockMilk.java diff --git a/minecraft/liquidmechanics/common/block/liquids/BlockOil.java b/src/minecraft/liquidmechanics/common/block/liquids/BlockOil.java similarity index 100% rename from minecraft/liquidmechanics/common/block/liquids/BlockOil.java rename to src/minecraft/liquidmechanics/common/block/liquids/BlockOil.java diff --git a/minecraft/liquidmechanics/common/block/liquids/BlockOilFlowing.java b/src/minecraft/liquidmechanics/common/block/liquids/BlockOilFlowing.java similarity index 100% rename from minecraft/liquidmechanics/common/block/liquids/BlockOilFlowing.java rename to src/minecraft/liquidmechanics/common/block/liquids/BlockOilFlowing.java diff --git a/minecraft/liquidmechanics/common/handlers/UpdateConverter.java b/src/minecraft/liquidmechanics/common/handlers/UpdateConverter.java similarity index 100% rename from minecraft/liquidmechanics/common/handlers/UpdateConverter.java rename to src/minecraft/liquidmechanics/common/handlers/UpdateConverter.java diff --git a/minecraft/liquidmechanics/common/item/ItemGuage.java b/src/minecraft/liquidmechanics/common/item/ItemGuage.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemGuage.java rename to src/minecraft/liquidmechanics/common/item/ItemGuage.java diff --git a/minecraft/liquidmechanics/common/item/ItemLiquidMachine.java b/src/minecraft/liquidmechanics/common/item/ItemLiquidMachine.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemLiquidMachine.java rename to src/minecraft/liquidmechanics/common/item/ItemLiquidMachine.java diff --git a/minecraft/liquidmechanics/common/item/ItemParts.java b/src/minecraft/liquidmechanics/common/item/ItemParts.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemParts.java rename to src/minecraft/liquidmechanics/common/item/ItemParts.java diff --git a/minecraft/liquidmechanics/common/item/ItemPipe.java b/src/minecraft/liquidmechanics/common/item/ItemPipe.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemPipe.java rename to src/minecraft/liquidmechanics/common/item/ItemPipe.java diff --git a/minecraft/liquidmechanics/common/item/ItemReleaseValve.java b/src/minecraft/liquidmechanics/common/item/ItemReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemReleaseValve.java rename to src/minecraft/liquidmechanics/common/item/ItemReleaseValve.java diff --git a/minecraft/liquidmechanics/common/item/ItemTank.java b/src/minecraft/liquidmechanics/common/item/ItemTank.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemTank.java rename to src/minecraft/liquidmechanics/common/item/ItemTank.java diff --git a/minecraft/liquidmechanics/common/item/ItemValve.java b/src/minecraft/liquidmechanics/common/item/ItemValve.java similarity index 100% rename from minecraft/liquidmechanics/common/item/ItemValve.java rename to src/minecraft/liquidmechanics/common/item/ItemValve.java diff --git a/minecraft/liquidmechanics/common/tileentity/ContainerReleaseValve.java b/src/minecraft/liquidmechanics/common/tileentity/ContainerReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/ContainerReleaseValve.java rename to src/minecraft/liquidmechanics/common/tileentity/ContainerReleaseValve.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityGenerator.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityGenerator.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityGenerator.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityGenerator.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityMachine.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityMachine.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityMachine.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityMachine.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java similarity index 99% rename from minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java index c5e16257..9009f26b 100644 --- a/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java +++ b/src/minecraft/liquidmechanics/common/tileentity/TileEntityPipe.java @@ -98,7 +98,6 @@ public class TileEntityPipe extends TileEntity implements ITankContainer, IReadO } else { - stored.drain(((ITankContainer) connectedBlocks[i]).fill(dir.getOpposite(), stack, true), true); } } diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityPump.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityPump.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityReleaseValve.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityRod.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityRod.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityRod.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityRod.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntitySink.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntitySink.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntitySink.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntitySink.java diff --git a/minecraft/liquidmechanics/common/tileentity/TileEntityTank.java b/src/minecraft/liquidmechanics/common/tileentity/TileEntityTank.java similarity index 100% rename from minecraft/liquidmechanics/common/tileentity/TileEntityTank.java rename to src/minecraft/liquidmechanics/common/tileentity/TileEntityTank.java diff --git a/minecraft/liquidmechanics/resource/ReleaseValve.png b/src/minecraft/liquidmechanics/resource/ReleaseValve.png similarity index 100% rename from minecraft/liquidmechanics/resource/ReleaseValve.png rename to src/minecraft/liquidmechanics/resource/ReleaseValve.png diff --git a/minecraft/liquidmechanics/resource/Sink.png b/src/minecraft/liquidmechanics/resource/Sink.png similarity index 100% rename from minecraft/liquidmechanics/resource/Sink.png rename to src/minecraft/liquidmechanics/resource/Sink.png diff --git a/minecraft/liquidmechanics/resource/blocks.png b/src/minecraft/liquidmechanics/resource/blocks.png similarity index 100% rename from minecraft/liquidmechanics/resource/blocks.png rename to src/minecraft/liquidmechanics/resource/blocks.png diff --git a/minecraft/liquidmechanics/resource/blue.png b/src/minecraft/liquidmechanics/resource/blue.png similarity index 100% rename from minecraft/liquidmechanics/resource/blue.png rename to src/minecraft/liquidmechanics/resource/blue.png diff --git a/minecraft/liquidmechanics/resource/gear_shaft_piston.png b/src/minecraft/liquidmechanics/resource/gear_shaft_piston.png similarity index 100% rename from minecraft/liquidmechanics/resource/gear_shaft_piston.png rename to src/minecraft/liquidmechanics/resource/gear_shaft_piston.png diff --git a/minecraft/liquidmechanics/resource/items.png b/src/minecraft/liquidmechanics/resource/items.png similarity index 100% rename from minecraft/liquidmechanics/resource/items.png rename to src/minecraft/liquidmechanics/resource/items.png diff --git a/minecraft/liquidmechanics/resource/lang/en_US.properties b/src/minecraft/liquidmechanics/resource/lang/en_US.properties similarity index 100% rename from minecraft/liquidmechanics/resource/lang/en_US.properties rename to src/minecraft/liquidmechanics/resource/lang/en_US.properties diff --git a/minecraft/liquidmechanics/resource/mechanical/GearRod.png b/src/minecraft/liquidmechanics/resource/mechanical/GearRod.png similarity index 100% rename from minecraft/liquidmechanics/resource/mechanical/GearRod.png rename to src/minecraft/liquidmechanics/resource/mechanical/GearRod.png diff --git a/minecraft/liquidmechanics/resource/mechanical/Generator.png b/src/minecraft/liquidmechanics/resource/mechanical/Generator.png similarity index 100% rename from minecraft/liquidmechanics/resource/mechanical/Generator.png rename to src/minecraft/liquidmechanics/resource/mechanical/Generator.png diff --git a/minecraft/liquidmechanics/resource/pipes/BlackPipe.png b/src/minecraft/liquidmechanics/resource/pipes/BlackPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/BlackPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/BlackPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/BluePipe.png b/src/minecraft/liquidmechanics/resource/pipes/BluePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/BluePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/BluePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/BrownPipe.png b/src/minecraft/liquidmechanics/resource/pipes/BrownPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/BrownPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/BrownPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/CyanPipe.png b/src/minecraft/liquidmechanics/resource/pipes/CyanPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/CyanPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/CyanPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/GreenPipe.png b/src/minecraft/liquidmechanics/resource/pipes/GreenPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/GreenPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/GreenPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/GreyPipe.png b/src/minecraft/liquidmechanics/resource/pipes/GreyPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/GreyPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/GreyPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/LightBluePipe.png b/src/minecraft/liquidmechanics/resource/pipes/LightBluePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/LightBluePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/LightBluePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/LimePipe.png b/src/minecraft/liquidmechanics/resource/pipes/LimePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/LimePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/LimePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/MagentaPipe.png b/src/minecraft/liquidmechanics/resource/pipes/MagentaPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/MagentaPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/MagentaPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/OrangePipe.png b/src/minecraft/liquidmechanics/resource/pipes/OrangePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/OrangePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/OrangePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/PinkPipe.png b/src/minecraft/liquidmechanics/resource/pipes/PinkPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/PinkPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/PinkPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/Pipe.png b/src/minecraft/liquidmechanics/resource/pipes/Pipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/Pipe.png rename to src/minecraft/liquidmechanics/resource/pipes/Pipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/PurplePipe.png b/src/minecraft/liquidmechanics/resource/pipes/PurplePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/PurplePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/PurplePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/RedPipe.png b/src/minecraft/liquidmechanics/resource/pipes/RedPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/RedPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/RedPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/SilverPipe.png b/src/minecraft/liquidmechanics/resource/pipes/SilverPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/SilverPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/SilverPipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/WhitePipe.png b/src/minecraft/liquidmechanics/resource/pipes/WhitePipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/WhitePipe.png rename to src/minecraft/liquidmechanics/resource/pipes/WhitePipe.png diff --git a/minecraft/liquidmechanics/resource/pipes/YellowPipe.png b/src/minecraft/liquidmechanics/resource/pipes/YellowPipe.png similarity index 100% rename from minecraft/liquidmechanics/resource/pipes/YellowPipe.png rename to src/minecraft/liquidmechanics/resource/pipes/YellowPipe.png diff --git a/minecraft/liquidmechanics/resource/pumps/WaterPump.png b/src/minecraft/liquidmechanics/resource/pumps/WaterPump.png similarity index 100% rename from minecraft/liquidmechanics/resource/pumps/WaterPump.png rename to src/minecraft/liquidmechanics/resource/pumps/WaterPump.png diff --git a/minecraft/liquidmechanics/resource/tanks/Corner.png b/src/minecraft/liquidmechanics/resource/tanks/Corner.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/Corner.png rename to src/minecraft/liquidmechanics/resource/tanks/Corner.png diff --git a/minecraft/liquidmechanics/resource/tanks/CornerLava.png b/src/minecraft/liquidmechanics/resource/tanks/CornerLava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/CornerLava.png rename to src/minecraft/liquidmechanics/resource/tanks/CornerLava.png diff --git a/minecraft/liquidmechanics/resource/tanks/CornerMilk.png b/src/minecraft/liquidmechanics/resource/tanks/CornerMilk.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/CornerMilk.png rename to src/minecraft/liquidmechanics/resource/tanks/CornerMilk.png diff --git a/minecraft/liquidmechanics/resource/tanks/CornerWater.png b/src/minecraft/liquidmechanics/resource/tanks/CornerWater.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/CornerWater.png rename to src/minecraft/liquidmechanics/resource/tanks/CornerWater.png diff --git a/minecraft/liquidmechanics/resource/tanks/LavaTank.png b/src/minecraft/liquidmechanics/resource/tanks/LavaTank.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/LavaTank.png rename to src/minecraft/liquidmechanics/resource/tanks/LavaTank.png diff --git a/minecraft/liquidmechanics/resource/tanks/MilkTank.png b/src/minecraft/liquidmechanics/resource/tanks/MilkTank.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/MilkTank.png rename to src/minecraft/liquidmechanics/resource/tanks/MilkTank.png diff --git a/minecraft/liquidmechanics/resource/tanks/SteamTank.png b/src/minecraft/liquidmechanics/resource/tanks/SteamTank.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/SteamTank.png rename to src/minecraft/liquidmechanics/resource/tanks/SteamTank.png diff --git a/minecraft/liquidmechanics/resource/tanks/Tank.png b/src/minecraft/liquidmechanics/resource/tanks/Tank.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/Tank.png rename to src/minecraft/liquidmechanics/resource/tanks/Tank.png diff --git a/minecraft/liquidmechanics/resource/tanks/Tank2.png b/src/minecraft/liquidmechanics/resource/tanks/Tank2.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/Tank2.png rename to src/minecraft/liquidmechanics/resource/tanks/Tank2.png diff --git a/minecraft/liquidmechanics/resource/tanks/WaterTank.png b/src/minecraft/liquidmechanics/resource/tanks/WaterTank.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/WaterTank.png rename to src/minecraft/liquidmechanics/resource/tanks/WaterTank.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/0.png b/src/minecraft/liquidmechanics/resource/tanks/guage/0.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/0.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/0.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/0Fuel.png b/src/minecraft/liquidmechanics/resource/tanks/guage/0Fuel.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/0Fuel.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/0Fuel.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/0Lava.png b/src/minecraft/liquidmechanics/resource/tanks/guage/0Lava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/0Lava.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/0Lava.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/1.png b/src/minecraft/liquidmechanics/resource/tanks/guage/1.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/1.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/1.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/1Fuel.png b/src/minecraft/liquidmechanics/resource/tanks/guage/1Fuel.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/1Fuel.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/1Fuel.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/1Lava.png b/src/minecraft/liquidmechanics/resource/tanks/guage/1Lava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/1Lava.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/1Lava.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/2.png b/src/minecraft/liquidmechanics/resource/tanks/guage/2.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/2.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/2.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/2Fuel.png b/src/minecraft/liquidmechanics/resource/tanks/guage/2Fuel.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/2Fuel.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/2Fuel.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/2Lava.png b/src/minecraft/liquidmechanics/resource/tanks/guage/2Lava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/2Lava.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/2Lava.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/3.png b/src/minecraft/liquidmechanics/resource/tanks/guage/3.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/3.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/3.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/3Fuel.png b/src/minecraft/liquidmechanics/resource/tanks/guage/3Fuel.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/3Fuel.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/3Fuel.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/3Lava.png b/src/minecraft/liquidmechanics/resource/tanks/guage/3Lava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/3Lava.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/3Lava.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/4.png b/src/minecraft/liquidmechanics/resource/tanks/guage/4.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/4.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/4.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/4Fuel.png b/src/minecraft/liquidmechanics/resource/tanks/guage/4Fuel.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/4Fuel.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/4Fuel.png diff --git a/minecraft/liquidmechanics/resource/tanks/guage/4Lava.png b/src/minecraft/liquidmechanics/resource/tanks/guage/4Lava.png similarity index 100% rename from minecraft/liquidmechanics/resource/tanks/guage/4Lava.png rename to src/minecraft/liquidmechanics/resource/tanks/guage/4Lava.png