Commit graph

3906 commits

Author SHA1 Message Date
Rseifert
a3c43609ea Got rid of Enum system
What i have is not much diffrent but its a start to allowing more liquid
types without having to add them myself. The current method has 3
defualt liquids that are preset. The new system also uses String names
to ID liquid instead of Enums. A new class Called LiquidData will keep
track of the data need to ID, and use the Liquids.

In the process i also fixed a few crafting recipes that were
removed/messed up in a patch a while back.

Plan for new system
*Have default liquid type that come with textures/renders
*Have several univeral pipes that can accept all Liquid types
*Have a way of placeing a universal pipe and then converting to a
regulated pipe, pipe that only take one liquid type
*Have a tool for doing the above
*Change the release Valve to be univeral with a GUI to restrict flow and
Liquid type extracted
2013-01-03 12:18:47 -05:00
Rseifert
6401261e19 Basic Upload before i break everything
Ok i'm going to make an attempt to change how everything works. Before i
do that let backup the code.
2013-01-03 09:58:19 -05:00
Rseifert
a1ed4a5a4d BugFix: Fixed Tanks to drain correctly
Though it was the release valve but it turns out the Storage tanks
needed coding to drain themselves after giving the release valve the
liquid ammount present.

Other than that the rest of the changes are just renaming from past push
2013-01-03 07:34:57 -05:00
Brian Ricketts
84c74bc589 Worked on encoder more
Also made Disks only show the number of commands on them
2013-01-02 14:12:27 -06:00
Rseifert
3eb57983d2 Pushing code changed by Calc
Have yet to find all the changes but so far
Bug: Release Valve creates infinite stream
2013-01-02 13:55:29 -05:00
Brian Ricketts
e7a0d11263 More work on Encoder GUI 2012-12-30 23:45:53 -06:00
Brian Ricketts
f50698c57d Fixed filters and disks stacking (and messing up NBT data) 2012-12-30 15:45:34 -06:00
Brian Ricketts
433b06ea55 Started adding the programmer for the arm (it and disks need textures!) 2012-12-30 15:43:13 -06:00
Brian Ricketts
0ec1fd449d Promoted recommended build 0.2.1 #40 2012-12-30 00:48:23 -06:00
Brian Ricketts
35f73a7fff Yeah, that last commit didn't work. 2012-12-30 00:41:11 -06:00
Brian Ricketts
788b325312 Potential fix for tubes not obeying filters 2012-12-30 00:24:38 -06:00
Brian Ricketts
d0131218d8 Merge branch 'master' of https://github.com/calclavia/Assembly-Line
Conflicts:
	buildlocal.bat
2012-12-29 23:45:15 -06:00
Brian Ricketts
8491d8c6e6 Made a script based on "publish.bat" that simply packs a local-only test build 2012-12-29 23:43:34 -06:00
Brian Ricketts
0c5498ecb7 Made a script based on "publish.bat" that simply packs a local-only test build 2012-12-29 23:42:19 -06:00
Brian Ricketts
90024ad8c2 Crates now support imprints
(Code formatter comment max. length set to 9999 too...)
2012-12-29 23:39:17 -06:00
Brian Ricketts
2e9e4d0381 Detector is now rotatable 2012-12-29 22:39:46 -06:00
Brian Ricketts
54aa4f2ee2 Manipulator mode fix - conflict with inversion 2012-12-29 22:13:43 -06:00
Brian Ricketts
f374e916b9 Fixed down-slope power transmission
(Off-by-one error, sir... XD)
2012-12-29 18:37:35 -06:00
Brian Ricketts
85cf225efb Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git
Conflicts:
	src/minecraft/assemblyline/client/render/RenderHelper.java
	src/minecraft/assemblyline/client/render/RenderImprintable.java
2012-12-29 18:24:45 -06:00
Brian Ricketts
f4e1576dbb Supposedly fixed Manipulators and Rejectors not powering adjacent belts
Fix was to deduct power requirement from wattsReceived instead of
setting it to "0". Rejector also wasn't calling super.onUpdate().
2012-12-29 18:15:12 -06:00
Brian Ricketts
3842d4a81e Globalized ability to invert filter
Globalized colored float text depending on inversion
2012-12-29 15:50:20 -06:00
Brian Ricketts
9fd9466457 Globalized ability to invert filter
Globalized colored float text depending on inversion
2012-12-29 15:38:08 -06:00
Henry Mao
800684f553 Build 2012-12-30 02:11:41 +08:00
Henry Mao
e12c9231e2 Renamed filter to imprint 2012-12-30 00:03:05 +08:00
Henry Mao
56a9ff0add Fixed textures 2012-12-29 23:58:16 +08:00
Henry Mao
9cc32fd692 Version Bump 2012-12-29 23:50:03 +08:00
Henry Mao
07d7759e8f Assembly Line 0.2.0 Release 2012-12-29 17:50:53 +08:00
Henry Mao
0d553f03ed Simplified code 2012-12-29 17:35:46 +08:00
Henry Mao
8c5d407ca1 Added un-imprinting feature 2012-12-29 17:05:40 +08:00
Brian Ricketts
008e22a35a Merge branch 'master' of https://github.com/calclavia/Assembly-Line 2012-12-29 01:16:48 -06:00
Brian Ricketts
6c0ad6cb20 Updated language file for Imprinter
Changed version number to 0.2.0
2012-12-29 01:15:21 -06:00
Brian Ricketts
5c03b2de3b Updated language file for Imprinter
Changed version number to 0.2.0
2012-12-29 01:14:09 -06:00
Brian Ricketts
95f27d5408 Implemented filter crafting in the Imprinter
(Renamed Stamper to Imprinter)
2012-12-29 01:03:48 -06:00
Henry Mao
5c42b9ae6a Attempt to fix packet issue 2012-12-29 13:04:51 +08:00
Henry Mao
585a2b9599 Removed unused inventory classes 2012-12-29 12:48:43 +08:00
Henry Mao
f6b4ce8f98 Made Manipulators accept filters 2012-12-29 12:07:08 +08:00
Henry Mao
c070788382 Made filter info render when looked at 2012-12-29 11:39:07 +08:00
Henry Mao
147ae58b4c Reformat and Reorganize 2012-12-29 11:25:11 +08:00
Henry Mao
142c25603a Empty commit 2012-12-29 11:10:16 +08:00
Brian Ricketts
88596a9361 Publish release 35 for 0.1.9
0.2.0 is coming later
2012-12-28 18:13:26 -06:00
Brian Ricketts
aa06a8b6c0 Revert "Published and updated info.txt"
This reverts commit aa8a1b5979.
2012-12-28 18:09:56 -06:00
Brian Ricketts
aa8a1b5979 Published and updated info.txt 2012-12-28 17:52:33 -06:00
Brian Ricketts
2a732328a1 Finished drawing labels over filter-supporting machines
Also cleaned up some packet code and modularized filters
2012-12-28 17:43:23 -06:00
Brian Ricketts
46c59251fc Mis-commit 2012-12-28 14:43:24 -06:00
Brian Ricketts
0bc33ea862 Finished the Rejector rendering code...now renders filter contents above
it when the player is within 5 blocks
2012-12-28 14:40:02 -06:00
Brian Ricketts
6cd86ee3c5 Starting to work on printing the filtered items above the rejector 2012-12-28 03:23:55 -06:00
Brian Ricketts
d1dfaad6dd Added missing belt textures 2012-12-28 03:13:37 -06:00
Brian Ricketts
b55ca97831 Animated the conveyor belts
To do: animate manipulators
2012-12-28 01:44:34 -06:00
Henry Mao
790fbb3e9c AS 0.1.9 Release 2012-12-28 14:30:11 +08:00
Henry Mao
c4105e06bf Attempted to make autocrafting 2012-12-27 20:05:15 +08:00