Commit graph

207 commits

Author SHA1 Message Date
Robert Seifert
222f31db5b move some class to my code lib 2013-04-20 07:34:04 -04:00
Rseifert
4e6275a891 sync 2013-04-20 03:18:00 -04:00
Rseifert
299edd1f0f Fixed generic pipe connections
Was doing the connection checks wrong. Now its check for meta data if
the pipe uses the same class file for connections. Its should connection
to any generic pipe of its color and iron pipes. This should allow for
unique pipe networks for generic liquid types. This however will not
allow for a set liquid type filtering or transport.

Also in an earlier push i changed generic pipes to only move 1 bucket a
request but 3 request for non-generic pipes a request.
2013-04-19 01:20:25 -04:00
Rseifert
13c2f1fb6c Fixed generic pipe filling 2013-04-17 15:12:44 -04:00
Rseifert
35d8812742 Fixed pipe connection for pump 2013-04-17 15:02:28 -04:00
Rseifert
5eff4fa74a Fixed Construction pump working with energy supply
Still need to do more debug for rotation and item rendering
2013-04-17 14:56:48 -04:00
Rseifert
225b3a3ebf added drain recipe and construction pump recipe 2013-04-17 14:22:54 -04:00
Rseifert
6608d8aa36 Changed pipe crafting
pipe crafting is now a set recipe instead of shapeless. Though with this
change you can now use any pipe color inter mixed with a dye to get 4
pipes of that color back. As well sticking a pipe in the crafting grid
will result in an uncolored pipe back.
2013-04-17 14:07:57 -04:00
Rseifert
a3335491d4 fixed render and connection between pipes
There is however an odd error with old pipes updating to the new system.
Since the new pipes are an extend of the old pipes they may thing
themselves as old pipes. breaking them and replacing solves this isssue
2013-04-17 13:48:25 -04:00
Rseifert
2b093d349e added renders for new pipes
still need to test and debug including create new textures for specific
pipes. Recipes are also still need for new items as well as reversed
color crafting
2013-04-17 13:25:58 -04:00
Rseifert
57d3fc6cce worked on new pipes
Just need to add renders too the new pipes and change the textures off
the old ones. I might also need to do some testing since i changed a few
methods.
2013-04-15 23:12:39 -04:00
Rseifert
3684f3300f add generic colored pipe set 2013-04-15 22:38:56 -04:00
Rseifert
8435e6be96 adjusted isValidLiquid 2013-04-15 22:12:27 -04:00
Rseifert
1f7e4ce470 worked on tank and network a bit 2013-04-15 21:58:50 -04:00
Rseifert
34e7e6c7a6 adjusted micdoodle8 's changes for tanks 2013-04-15 07:49:41 -04:00
Rseifert
ae9a6227f7 added model for construction pump 2013-04-15 07:31:09 -04:00
Robert WC Seifert
69a33f940f Merge pull request #11 from micdoodle8/master
Tanks will be added to creative/NEI depending on fuels registered.
2013-04-11 15:11:42 -07:00
micdoodle8
d7005cf3df Tanks will be added to creative/NEI depending on fuels registered. 2013-04-11 14:59:29 -04:00
Rseifert
ae67929812 updated info 2013-04-11 02:24:25 -04:00
Rseifert
05de063080 url address update 2013-04-11 02:15:29 -04:00
Rseifert
df95553cb1 no change 2013-04-11 02:10:27 -04:00
Rseifert
6d98e90acb Cleanup and bug fixes
Worked on fixing a possible bug with release valve draining and
ITankContainer that might not have had tanks on that side.
2013-04-10 17:32:46 -04:00
Rseifert
c6c0f3c9f5 Updated Read me 2013-04-10 06:10:06 -04:00
Rseifert
bd3e705fd9 added a lisence 2013-04-10 06:05:06 -04:00
Rseifert
8abbab4077 Added more Mechanical api stuff
Not sure if i want to work on this right now as its just a bonus
addition to FluidMech a this point. Though it badly needs overhauled to
include its own pathfinder. The rods need to work as one rod using the
same pos, spin speed, Force, etc. As well math needs to be added to calc
force correctly
2013-04-10 04:47:16 -04:00
Rseifert
b873cb2cb1 Removed IConnectionProvide from pipes 2013-04-10 04:45:39 -04:00
Rseifert
13bf76a170 moved model folder 2013-04-10 04:06:24 -04:00
Rseifert
f8c76236a4 cleanup + edited build script 2013-04-10 04:03:32 -04:00
Rseifert
94ce8c3181 removed ue api from repo 2013-04-10 03:57:14 -04:00
Rseifert
9ba9920c87 updated ignore file 2013-04-10 03:56:03 -04:00
Rseifert
06228fb4cb copy of old build script for refrence 2013-04-10 03:55:24 -04:00
Rseifert
b2a6da7d21 added build.xml
trying to see how this works in relation to jenkins and if i can auto
insert version # into src files
2013-04-10 03:44:32 -04:00
Rseifert
816e377eba Cleanup 2013-04-10 03:37:15 -04:00
Rseifert
0f89071f4c updated gitignore 2013-04-10 03:34:18 -04:00
Rseifert
ecadb788cb UE file update
no change but github thinks there is one
2013-04-10 03:32:23 -04:00
Rseifert
e9a5cda3a5 Fixed block names for drain and pump 2013-04-10 02:30:03 -04:00
Rseifert
1c0b538d74 Change recipes to be easier to read
Just have to remember not too spam Ctrl + Shift + F or it will reformate
all the lines again
2013-04-10 02:20:06 -04:00
Rseifert
d5572c63d4 version changes and cleanup
Going to copy Electrical Expantion a bit and add a similiar system for
version #s and info file management. This way version # match up better
between the 3+ things that use it.
2013-04-10 02:13:41 -04:00
Rseifert
bf52947a57 updated ignore file 2013-04-09 22:54:24 -04:00
Rseifert
b3d80000b0 fixed texture uploading 2013-04-09 22:50:38 -04:00
Rseifert
155639005c Version++ && included UE api
Maybe having the UE included in the Github will allow jenkins to build
correctly
2013-04-09 01:31:16 -04:00
Rseifert
b02bc22d45 add collection sorter to the drain method
Tested and it looks like it works as well though i have to give
aidancbrandy(IDK github name) some credit for giving me the ideal
earlier to remove non-source Fluid Block each update. It will the
collection sorter lets the drain method over power water's ability to
refill the area.
2013-04-09 00:51:13 -04:00
Rseifert
d36010e9a6 Add a collection sorter to the fill method
This should if done correctly place the closest and lowest Y fill-able
blocks at the top of the list so they get fill first. So far in testing
it looked like it worked as the water bubble created expanded evenly
outward instead of more in one direction.
2013-04-09 00:00:10 -04:00
Rseifert
479177d662 More work on pump and drain
can't recall all the work i've done since last commit. However, i've
test and improve the path finder and how its used by the drain. It now
works 100% but need more improvement. Especial the draining part as
source will keep refilling if not drained right
2013-04-08 22:47:25 -04:00
Rseifert
e8586b9e81 Fixed request list cleanup in drain
cleanup was not removing unconnected pumps correctly. Now if there is no
pipe network connection to the pump it will be removed.
2013-04-08 20:23:53 -04:00
Rseifert
ce9aad402f Fixed new pathfinder
I've seen it drain so far but i need to test it more.
2013-04-08 19:49:24 -04:00
Rseifert
0d924dc3c8 Correct errors with new pathfinder 2013-04-08 14:41:48 -04:00
Rseifert
135e20f453 Merged pathfinder into one class
This path finder no longer depends on Calc's PathFinder to function.
however it is derived from his work so he still gets credit.

The new pathfinder works about the same as calc's except instead of
trying to find a path its trying to find all resources along the path. I
still need to improve this to have a dumped down version of A* so that
i'm filling the closest blocks first and draining the furthest block
first.
2013-04-08 13:27:44 -04:00
Rseifert
8bc375b0ee change fill area to be limited
both drain and fill area will share a max edit limit per second. Current
its 30 blocks a second but a config later will allow this to be changed.
2013-04-07 22:15:29 -04:00
Rseifert
f491e6f599 forgot to reset yFillStart if A* results <= 0 2013-04-07 22:12:35 -04:00