Commit graph

182 commits

Author SHA1 Message Date
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
Rseifert
0211f961c1 Added A* Path finder for Fill Area
This should? Fix the issue with the drain trying to fill outside of the
possible path bounds. What is is doing is finding a bath from the drain
to the next Y level change. If it fails to find a path the yFillStart
doesn't increase to the next level.
2013-04-07 22:11:46 -04:00
Rseifert
a5281b9a12 pre added ideal for teleporting liquid pipes
the idea is to have the pipe act like a normal pipe but connected to
another pipe and merge its network with the current pipe's network. This
way no real extra code is required as the two split networks will act as
one.
2013-04-07 22:10:32 -04:00
Rseifert
cd91595423 Fixed pump sides 2013-04-07 22:09:03 -04:00
Rseifert
7967909aa0 Cleanup of drain code
rewrote pathfinder as well so not to need the second path finder to find
highest block. Instead it  works its way up first, then to everywhere
else.
2013-04-07 21:36:37 -04:00
Rseifert
dc5d67a22d Creating some Liquid/Gas prefabs
Just a quick Ideal for creating new Gases or Liquid block on the fly.
Gases will behave like grass and will spread from there source location.
Over time they will decay and vanish.
2013-04-07 21:08:53 -04:00
Rseifert
b63526ddaf Fixed up drain fill world
Made the path finder work better and stop filling block out of range of
the water it was filling in.
2013-04-07 21:07:06 -04:00
Rseifert
e02f404d55 fixed rotation and add sudo textures
these textures are temp and for mostly testing. I will add models later
for these two blocks.
2013-04-07 09:00:47 -04:00
Rseifert
5d8af57115 Drain fill area mostly done
A ton of testing is need for this to confirm that it works. However, for
now its done enough to place in a release.
2013-04-07 08:21:09 -04:00
Rseifert
3063368d31 Adding fill world handling for drain
doesn't work at all but the ideal is there at least
2013-04-07 04:54:44 -04:00
Rseifert
66a1502bf4 Pump works \0/
Well i still need to check using other liquids than water
Also need to recode to actual put the water somewhere else
Need to make models, and textures
A Gui for the pump to select liquid to pump and set the volume
2013-04-07 03:52:08 -04:00
Rseifert
6939d3ca6f got pathfinder simi functional
not sure what i f'd up between this and my test build repo. What ever
happened it works for water now and not for lava.
2013-04-07 02:56:41 -04:00
Rseifert
7154161a5d added textures too sides of block for testing
also added wrench support in the process though its basic
2013-04-06 23:38:37 -04:00
Rseifert
a5b1081c4b setup blocks for pump&drain
As well worked on the basic functionality of the machines. Not exactly
sure what was changed as i coded these 4 hours ago and am just now
uploading.
2013-04-06 23:04:13 -04:00
Robert WC Seifert
0bfdadfd52 Merge pull request #9 from calclavia/patch-1
Added MCVERSION for Jenkins
2013-04-06 17:20:31 -07:00
Henry Mao
9c5df95655 Added MCVERSION for Jenkins 2013-04-06 15:33:52 +08:00
Rseifert
e69c046ad4 Last min additions
Added path finder to get highest water source block with in 10K block
process
Added Vars for max drain for drain and pump. Pump will have a gui
setting for this later and drain a config option
Added PatherFinder for finding highest block of an ID
2013-04-04 01:46:49 -04:00
Rseifert
21e340dd9d Finished up pump and drain tile code
Need to finish the blocks which i'll do later. As well i still need to
set the forgeDirection for input output for both tiles.
2013-04-04 01:25:44 -04:00
Rseifert
4ef06dc48a added construction pump
working on rewriting this from scratch based off of a demo pump i've
been working of out of project. The demo pump was limited though it
functioned very well.

This new pump will be designed to drain lakes, and even oceans if the
area can stay loaded. As well it works like the redpower one and will
drain water threw a drain rather than an actual block pump. The pump
will request the drain to find it liquid and fill the pump(Not how it
works in real life but best way to simulate it).
2013-04-04 00:27:46 -04:00
Rseifert
c99bdb1e4e Clean up of unneeded files 2013-04-04 00:25:25 -04:00
Rseifert
33866aafff Changed canConnect to canPipeConnect 2013-04-03 22:35:42 -04:00
Rseifert
2eb5d04c85 updated to 1.5.1 2013-04-03 22:28:20 -04:00
Rseifert
a15208b618 Move pipe render files to there one package 2013-04-02 17:26:06 -04:00
Rseifert
a934bb4ad2 Mass Import cleanup 2013-04-02 14:00:03 -04:00
Rseifert
67454a0a29 Worked out client side rendering for addons
I was doing it wrong just to be short. Long story though when calling
for the addon to render you can't do any of the normal GL11 call for
changing the location, scale, etc., or at least not the way i was doing
it. Only thing the addon creator should need to do is call for the part
of the model to render connected to the pipe core.
2013-04-02 13:52:44 -04:00
Rseifert
da813ace2d still more work on getting the addon working client
Still haven't got the pipe addons to work client side. I think it has
something to do with a packet handling issue but i can't tell yet. As
well some method are not getting called right in the sub tiles.
2013-04-02 03:06:30 -04:00