Commit graph

340 commits

Author SHA1 Message Date
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
Rseifert
2270d67495 add modstats api 2013-04-02 03:05:10 -04:00
Rseifert
9e032eddd4 more of the last 2013-04-02 01:42:53 -04:00
Rseifert
c4f9bb386f more work on pipe addons 2013-04-02 00:51:34 -04:00
Rseifert
0ae6eb5283 worked on pipe addon's packet handling
Its really hard to test this code at the moment but it should be mostly
done.
2013-04-02 00:05:00 -04:00
Rseifert
dc40ad0eef simi finished load/save for sub tiles
Has not been tested yet so most likely i will need to make more changes
to this code to prevent error.
Also i added some packet code to update the client with the new
TileEntities
2013-04-01 23:07:54 -04:00
Rseifert
1e464d4b41 added packet and tick update for pipe addons
Added Tick updating to the pipe addons
Added packet sending for the pipe addons though reading packets still
needs to be done
Added IPipeExtentionRender interface so the pipe render can render the
pipe addon on one of its sides.
2013-04-01 16:35:31 -04:00
Rseifert
b0f4273a92 working on pipe addons
A pipe addon will be a sub Tile that will attach itself to one of the
faces of a pipe. Then the pipe will store, and update this tile as if it
was a real TileEntity.
2013-03-31 23:53:01 -04:00
Rseifert
b3fa60ad63 bug fixes
Fixed pump pumping flowing sources, next step is to make a lava pump
Fixed connection issue with tanks and pipes. Not sure what the cause was
but i remove some code i added to the prefab fluidStorage class just to
be safe.
2013-03-31 03:37:58 -04:00
Rseifert
81717a4acc Fixed fill/drain bug with tanks
spent an hour looking for that bug and it turned out to be a missing !
(FacePalm). Though it did lead me to correct a missing ForgeDirection in
the on block activated code.
2013-03-31 03:24:24 -04:00
Rseifert
5af51d85dc cleanup + possible bug fixes 2013-03-31 03:12:41 -04:00
Rseifert
557d3f1ea8 version bump
needed bumped since the changes are major
2013-03-31 02:32:53 -04:00
Rseifert
f716ff4320 Fixed NPE when pump has no fill target 2013-03-31 02:31:35 -04:00
Rseifert
83eb1f75a5 Cleanup 2013-03-31 02:31:06 -04:00
Rseifert
9bd0dfee26 Removed Liquid Data + Cleanup
Go rid of LiquidData.class. Had my reasons for its use to store
pressure, name, colorcode, etc. However, the new system doesn't need it
and there are other ways to store the data i need. As well i no longer
need to store the string name as LiquidDictionary can get the name for
me
2013-03-31 02:16:29 -04:00
Rseifert
6d65e5d242 Cleanup + prefab changes
Cleaned up and changed a few classes after i added the prefabs. The tank
and sink now use the FluidStorage prefab to make them easier to read.
Sink basicly went down to packet code. Tank will do the same later after
i add in Code to turn it into a fluid network of its own. Also toyed
with release valve but nothing major changed
2013-03-31 01:33:11 -04:00
Rseifert
e63ef2859b Deprecating unkown liquid type
This was a cool idea to prevent NPE errors in the api however its
leading to other issues. This could be with how i was using it but it
just needs too go.
2013-03-31 01:30:58 -04:00
Rseifert
9600d77a40 add prefabs
tbh at this point it looks like i'm just copying UE. However, UE is
formatted nice and i want people to be able to navigate my system just
as easy.
2013-03-31 01:29:57 -04:00
Rseifert
2cc44b1d26 Build # 32 2013-03-30 03:22:31 -04:00
Rseifert
8b4bdfb276 fixed an issue with the pump filling network
not sure the cause but its fixed now. Also fixed a NPE with some debug
code but that is not important.
2013-03-30 03:08:18 -04:00
Rseifert
6b72ce462b Fixed save/loading liquid in a network
Got it for sure this time though it looks like i need to fix the
autoDrain method some more. As well prevent the fill method from trying
to refill the source of the liquid.
2013-03-30 02:27:42 -04:00
Rseifert
5a2034015a Added autoDrain && Fixed network saving
Pipes on each connection update should try to drain liquid from there
connected sources. I'll improve this later to limit the network from
getting surged all at once.

Also fixed, i think, the network saving its stored liquid to all
connected parts that can stored liquid. There still might be a bit of a
lose but i'll fix that later
2013-03-30 01:31:23 -04:00
Rseifert
7488a448f0 Made my own path finder checker
It worked without this but just too be safe i copied and changed the one
i was using from UE.
2013-03-30 00:21:33 -04:00
Rseifert
72932508d4 Add combined internal storage to pipe network
Pipe networks can now store up to so much liquid in the network.
Though untested it should save, load,  merge, split the stored liquid
2013-03-30 00:21:00 -04:00
Rseifert
7aed9a4618 Working out how to do pressure
At this point i'm a bit lost on how to do pressure in the system. I know
that the pressure will decrease with each part in the system it pass
threw. Which means later i'll need to add a path finder to simulate
this. However, right now i can't figure out how to do pressure produced
and pressure load needed. The only way i know is with one source of
pressure but in minecraft people will not just add one source of
pressure for a system.
2013-03-29 18:00:37 -04:00
Rseifert
3cfa7d33fe Fixed the render issue better 2013-03-29 16:44:10 -04:00
Rseifert
24e4f1f853 Merged network pipe with old pipe
Now that the new network pipes function up to the same level as the old
pipes its time to retire the old pipe. Only thing left too do with the
new pipes after this is too refine the code, add PSI methods, and make
it more compatible with other mods. Though as far as i can tell it
should work with other mods. However, if a mod doesn't use some methods
right then the pipes will not fill them as fast.
2013-03-29 16:43:59 -04:00
Rseifert
6eaaa91849 corrected an update issue with the pipes
pipes would only update there connection once and never again due to a
missing !
2013-03-29 16:34:13 -04:00
Rseifert
99331db20c Changed tank update style
I believe i am now using the built in update system that sends a
description packet if the block is marked for update by the game. This
should simplify it a little and i think correct a few other errors with
updating server side.
2013-03-29 16:27:15 -04:00
Rseifert
6a2a2f8809 change the tank to better work with the network
The  fluid network use the get tank side method to better find which
tank to fill first. However, i neglected to use this method correctly in
the tank and most likely something else but I'll get to that later.
2013-03-29 16:14:05 -04:00
Rseifert
b9c64dff24 Fixed a big stack Overflow with Network
still need to add more measures against this if a TileEntityNetworkPipe
gets on the Fill list it will infinite loop tile it crashes.
2013-03-29 15:54:41 -04:00
Rseifert
50cf28cbdb got rid of stacks args for canConnect
as cool of an ideal as it was it didn't get used as much. As well if
someone wants they can check the connecting pipe's colorCode for stack
info or threw some other way.
2013-03-29 15:28:52 -04:00
Rseifert
26af793479 Cleanup on tank
fixed model rendering north and south connector wrong
fixed water gauge not rendering with a texture
changed read out string for the tank to use a formatted string
2013-03-29 15:11:11 -04:00
Rseifert
90539dd231 Some cleanup for the tank's render
Still haven't fixed that odd error with the connector rendering on the
wrong face. Though the plan is to remove the connector render as you
can't see it past the pipe.
2013-03-29 14:54:10 -04:00
Rseifert
f24732fed4 setting up tank for IConnectionProvider
for now I will just use it for connection rules for rendering, and trade
processing. However, in the future i might use this with the path finder
to make a more uniform movement of liquids in the connected tanks. Might
even have them update all as one entity instead of each one at a time.
Though that will take some time if i set it up just like the UE wire's
network. As i will have to make sure that the liquid always travels to
the lowest tank first, and saves to the lower tanks. Which means that
i'll end up storing the tank's Y pos or getting it during
saving/loading/processing.
2013-03-29 14:53:19 -04:00
Rseifert
24ce9b59aa No sure were that came from
Looks like my computer picked up some very old code and included it on
push.
2013-03-29 14:49:37 -04:00
Rseifert
bb02bce6e9 reworked Tank's fill pipe function
changed/ merged fill pipe and fill tank bellow into one method that
doesn't care what is bellow it as long as its an ITankContainer
2013-03-29 14:08:24 -04:00
Rseifert
b92214e864 updated LiquidHandler's comments and methods
Still need to work on this and maybe break it up into better classes.
2013-03-29 14:05:18 -04:00
Rseifert
e8d553c4ef added code for setColor() to pipe
as well caught myself on the setColor() function for the tank were i
left out the ! in from of the check for client.
2013-03-29 13:26:58 -04:00
Rseifert
b604dafa50 Reworked the tank a bit
*changed how it sends packets to only update if something changes or at
random points in time.
*changed the getColor() to use the blocks metadata and not a var
*added code to the setColor to change the blocks metadata
*Fixed load function to not set content if it read as unkown
2013-03-29 13:24:54 -04:00
Rseifert
3dd19fc09d Fixed pipe connection for colors
Also change the name of a few classes in the process
2013-03-26 19:47:35 -04:00
Rseifert
ef6e6fde06 Fixed pipe update on load
ya that simple (face palm)
2013-03-26 18:16:30 -04:00
Rseifert
14578b179c Fixed network and pipes connections
Changed name of network part so save me from miss typing it every time
Fixed connection rules for pipes so that they will connect and render
Fixed networks merging and not crashing on merge
Fixed pipe gauge item's texture so it showed
Added a render for the network pipe (temp_use)
Bug connections/networks don't update on load just yet.
2013-03-26 18:11:38 -04:00