tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity
550 commits 1 branch 0 tags 45 MiB
Commit graph

377 commits

Author SHA1 Message Date
Henry Mao
73d9355e7a Build #63 2013-01-26 22:10:08 +08:00
Henry Mao
4761d8d826 Fixed NPE in Return Command 2013-01-26 22:04:56 +08:00
Henry Mao
2059523e28 Got crates to work with double clicks 2013-01-26 21:59:07 +08:00
Henry Mao
1c08afde7e Better Crate Controls 2013-01-26 21:40:57 +08:00
Henry Mao
1c783715a0 Fixed crate flicker issue 
Crates also works with Buildcraft pipes. Tested.
 2013-01-26 21:28:12 +08:00
Henry Mao
c1cb347d2e Removed weird crate render 2013-01-26 20:40:10 +08:00
Brian Ricketts
b5e307a2d3 Merge branch 'master' of https://github.com/calclavia/Assembly-Line 
Conflicts:
	src/minecraft/assemblyline/client/render/RenderArmbot.java
	src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java
	src/minecraft/assemblyline/common/machine/command/CommandFire.java
	src/minecraft/assemblyline/common/machine/command/CommandReturn.java
 2013-01-25 22:09:42 -06:00
Brian Ricketts
f443184f8b Updated UE API 
Added RotateTo command
Added .fire(velocity) to CC peripheral
Added .rotateTo(yaw, pitch) to CC peripheral
Changed .rotate(yaw) to .rotateBy(yaw, pitch) in CC API
Fixed RETURN command (and other ROTATE commands) not waiting properly
 2013-01-25 22:07:21 -06:00
Henry Mao
2cda43b63c Manipulators now work with multiblocks 2013-01-25 19:35:56 +08:00
Brian Ricketts
d7b90682f8 Improvements to FIRE command and ArmBot in general 
Fixed dupe bug
 2013-01-21 19:47:06 -06:00
Brian Ricketts
0c6fde1912 Added FIRE command (throws things and fires arrows!) 
Also fixed a manipulator bug (NULL CHECKS, CAL. NULL CHECKS!)
 2013-01-21 15:53:02 -06:00
briman0094
feaf8d61c7 Armbot can now be pitched with ROTATE 2013-01-20 18:05:03 -06:00
Brian Ricketts
9a1aa77adf Implemented Auto Crafting with ArmBot USE command 
Also fixed some major crafting bugs in Imprinter
Did *NOT* add *ANY* easter eggs. None. Zero. Zip. Nada.
 2013-01-20 02:51:24 -06:00
Brian Ricketts
76e81cf00a Implemented "USE" command 2013-01-20 00:09:51 -06:00
Brian Ricketts
d043109284 Added IUseable and apparently updated some build things. 2013-01-19 23:30:13 -06:00
Brian Ricketts
62ab7843aa Oops...forgot to revert from experimental crate renderer 2013-01-18 22:01:20 -06:00
Brian Ricketts
7d90ae8ddf Fixed more sounds -.- 2013-01-18 21:55:22 -06:00
Brian Ricketts
ef590bfa0b Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git 2013-01-18 21:53:06 -06:00
Brian Ricketts
86fd779608 Finished implementing CC API for armbots 2013-01-18 21:51:38 -06:00
Rseifert
be0518f2bf Fixed a SMP crash issue with sound for belts 
Not sure if you guys are even bug testing on SMP but you need too every
so often. SMP lan, and SMP Dedicated are two diffrent server types. The
SMP lan can get away with something like playing sound. However, doing
anything client related on SMP Dedicated will cause a crash. Make sure
in the code anything client releated is only done on the client reguard
less of how small.

Also who every changed the rejector to use the paper item and display
the item name above it good job. Its a nice feature and better than the
GUI I  had, however if there isn't a way alread we need to work in a way
to have several item on a rejector. Which we can either do with the
detector, another block, or the rejector itself.

On another note i turned down the AMP pull a little to make belt lines
easier to feed.
 2013-01-18 22:47:33 -05:00
Brian Ricketts
189fc9b857 Vastly improved Arm Bot (and added sounds! :O) 2013-01-18 17:55:43 -06:00
Brian Ricketts
b67b1d2bd3 Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git 2013-01-18 05:29:42 -06:00
Brian Ricketts
a68490ba6f Added new conveyor belt state and attempted to fix crates 2013-01-18 05:28:35 -06:00
Rseifert
3dd7fdada1 Changed item render for rejector 
Change out the item render for the rejector block. Also corrected a
minor model issue with the robotic arm but nothing major changed with
it.
 2013-01-17 21:00:06 -05:00
Rseifert
c6e3320609 Changed out the model for the Block 
*Still need to do the item view
*I also removed some unneeded textures
*Change gitignore to not include thumb.db files since they always seem
to change
 2013-01-17 20:32:53 -05:00
Brian Ricketts
787da0aeae Changed sound length so it's more "responsive" in game 2013-01-16 03:41:03 -06:00
Brian Ricketts
cac04ed7e4 Added sounds to the Conveyor Belts 2013-01-16 03:28:18 -06:00
Brian Ricketts
bf9f9d2392 Added conveyor sound resource 2013-01-16 02:34:54 -06:00
Brian Ricketts
7a048652ac Tried fixing ArmBot again... 2013-01-15 03:40:17 -06:00
Brian Ricketts
5c5f4395bb Started implementing a Lua API to act as a "wrapper" for the ArmBot. 2013-01-14 17:01:00 -06:00
Brian Ricketts
1fd05aade7 Improved armbot slightly 2013-01-14 15:35:29 -06:00
Henry Mao
e0ef452563 Rebuilt Recommended Build 2013-01-14 18:43:59 +08:00
Brian Ricketts
7e38f9027f First go at implementing the CC API for the ArmBot 2013-01-14 01:13:28 -06:00
Brian Ricketts
fb4e53eb02 Fixed more armbot derpiness 2013-01-13 03:27:41 -06:00
Brian Ricketts
947d229057 New recommended build 2013-01-13 02:35:28 -06:00
Henry Mao
ceb784fa26 AL 0.2.3 Release! 2013-01-13 15:51:43 +08:00
Henry Mao
b8423ef4e8 Fixed Armbots not initiating properly 2013-01-13 00:02:51 +08:00
Henry Mao
f02f085599 Got Armbot working nicely 2013-01-12 23:55:12 +08:00
Henry Mao
eb323c77ec Added Armbot recipe 2013-01-12 23:10:19 +08:00
Henry Mao
10312d6110 Finished Imprinter 2013-01-12 22:57:46 +08:00
Henry Mao
cab2361358 Briman, you do know about ItemStack.isItemEqual? 2013-01-12 22:38:34 +08:00
Henry Mao
bf481c0eca Fixed BIG ISidedInventory Bug 2013-01-12 22:26:34 +08:00
Henry Mao
7f08eaa0ef Removed weird extra function in manipulator 2013-01-12 22:23:35 +08:00
Henry Mao
09f519ede1 More work on the imprinter 2013-01-12 22:22:08 +08:00
Henry Mao
8a561c5921 Reworked Imprinter to have an inventory 2013-01-12 12:41:01 +08:00
Henry Mao
f58b88d30e Some work on imprinter 2013-01-12 12:12:07 +08:00
Brian Ricketts
09d4febe13 Some work on ArmBot (trying to smooth things up a bit) 2013-01-11 22:11:18 -06:00
Henry Mao
67a59a6af7 More work on Armbot 2013-01-11 23:56:36 +08:00
Henry Mao
f2a0867399 Fixed stacking glitch 2013-01-11 23:26:42 +08:00
Henry Mao
9b4665a6b5 Added repeat command 2013-01-11 22:41:57 +08:00
Henry Mao
b6bfa34561 Made grab and drop commmands work 2013-01-11 22:41:50 +08:00
Brian Ricketts
8668049be7 Some more work on the ArmBot and command handling 
TODO: Make the client not "simulate smoothness" if the thing hasn't
received any power in a while (right now it twitches)
 2013-01-10 13:02:08 -06:00
Henry Mao
6521bfa305 Added command parameters 2013-01-10 21:41:12 +08:00
Henry Mao
e07b10b47f Fixed command processing to work 2013-01-10 21:18:17 +08:00
Henry Mao
af74b4230b Make disks work on Armbot 2013-01-10 21:04:20 +08:00
Henry Mao
f1cd1bf848 Briman you doin' it wrong! :D 2013-01-10 19:54:25 +08:00
Henry Mao
7d822b0cee Fixed up slanted belt render 2013-01-10 19:50:11 +08:00
Rseifert
370681e042 Textured Slanted Model 
well mostly, the Up slant needs a seperate texture unless someone can
think of a way to use the current without rotating the model alot.
 2013-01-10 01:22:26 -05:00
Rseifert
d62c13e675 Correct Slanted Belt Render Issue 
Some one on the forum noticed this issue with Slanted Belts not
rendering connected. I didn't know this was a feature that was usable or
i would have caught it sooner. Anyways its mostly fixed but needs a
texture which i'll try to create.

Also who every made the conveyor belt textures animated like that nice
job.
 2013-01-09 23:11:17 -05:00
Brian Ricketts
1fa56d7827 Major work on ArmBot. 
Command/task management system still needs lots of work.
 2013-01-09 19:54:07 -06:00
Brian Ricketts
ab51a5203d Removed list of commands from disk 
Users will have too many commands! The list will be taller than the
screen! D:
 2013-01-09 15:31:50 -06:00
Brian Ricketts
34abdcd933 Fixed merge errors 2013-01-09 15:27:34 -06:00
Brian Ricketts
2a7c9ff03c Finished GUI encoder. 
(This is also an attempt to merge a Git conflict...let's see how it works)
 2013-01-09 15:15:40 -06:00
Henry Mao
7e9073fe55 Cheapened Recipe 2013-01-09 21:42:22 +08:00
Henry Mao
e029a35c6a Added rotate command 2013-01-09 21:24:23 +08:00
Henry Mao
c5b703a48f Fixed minor render bug 2013-01-09 21:21:03 +08:00
Henry Mao
b96dfd8783 Reorganized Commands 2013-01-09 21:12:48 +08:00
Henry Mao
93352fb3df Made belts render as connected when slanted 2013-01-09 20:49:17 +08:00
Henry Mao
74c631c691 Made conveyor belts have stair collision 2013-01-09 20:43:42 +08:00
Brian Ricketts
52abadc662 Moved some armbot classes into the armbot package (yay organization! :D) 
Also fixed typo in RenderArmbot
 2013-01-08 12:05:27 -06:00
Brian Ricketts
47fba5551d Made ArmHelper methods static 2013-01-08 11:46:03 -06:00
Henry Mao
4d95ce5621 Fixed Packet NPE 2013-01-08 21:28:32 +08:00
Henry Mao
2042a8625c Improved Armbot Render 2013-01-08 21:15:09 +08:00
Henry Mao
d81c015793 Added Armbot Blocks 2013-01-08 20:59:56 +08:00
Henry Mao
6fc94411b6 Version Bump 2013-01-08 19:51:28 +08:00
Henry Mao
b18db04b1e Added paramters 2013-01-08 19:22:26 +08:00
Henry Mao
f0dcceddb7 Improved Idle Command 2013-01-08 19:19:47 +08:00
Henry Mao
88f5e31eef Fixed NPE 2013-01-08 17:01:32 +08:00
Henry Mao
dbe53cbe41 Fixed minor bugs 2013-01-06 17:20:11 +08:00
Henry Mao
cb22292c9a Encoder Texture Update 2013-01-06 02:22:42 +08:00
Henry Mao
25c417322e AS 0.2.2 Release 2013-01-06 00:57:28 +08:00
Henry Mao
41de6381e1 Fixed Imprinter Crafting 2013-01-06 00:33:07 +08:00
Henry Mao
589290c463 Fixed imprinter outputing only stacks of one 2013-01-06 00:03:41 +08:00
Henry Mao
23e432ac23 Added own creative tab 2013-01-05 23:19:56 +08:00
Henry Mao
0d978d5de4 Fixed Encoder Gui Render Issues 2013-01-05 23:07:35 +08:00
Henry Mao
351478ade7 Fixed crates connecting to wires 2013-01-05 12:09:04 +08:00
Brian Ricketts
9e528c8461 Fixed manipulator's "self-pulse" mode not being saved to the world data 2013-01-04 12:32:31 -06:00
Brian Ricketts
698847dfcd Semi-"hacky" fix for belt rotation getting out of sync between client 
and server
 2013-01-04 12:29:32 -06:00
Brian Ricketts
cb6cc049d2 Fixed duplication bug 2013-01-04 12:20:53 -06:00
Henry Mao
2d3de9991c Added command subtraction 2013-01-05 00:08:16 +08:00
Henry Mao
f9ed7dbf60 Fixed oversized Gui and made packets work 2013-01-05 00:05:19 +08:00
Henry Mao
f2e0290c14 Removed useless variables 2013-01-04 23:26:46 +08:00
Henry Mao
6d8edae19f Added packet 2013-01-04 12:40:51 +08:00
Henry Mao
410e2c1c27 Moved tasks into commands 2013-01-04 12:32:24 +08:00
Henry Mao
be43631eae Version Bump 2013-01-04 12:26:59 +08:00
Henry Mao
1bd9e9096c Added Recipes 2013-01-04 12:25:40 +08:00
Henry Mao
180a811afa Format and Refactor 2013-01-04 12:24:31 +08:00
Henry Mao
4f1bd2ef73 Added Armbot Model Code 2013-01-04 12:16:49 +08:00
Brian Ricketts
8323cee352 Pretty sure this commit was to fix crates not obeying ISided, but I'm not quite sure... 2013-01-03 22:06:36 -06: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
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
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
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
6c0ad6cb20 Updated language file for Imprinter 
Changed version number to 0.2.0
 2012-12-29 01:15:21 -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
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
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
Henry Mao
91d48f4628 Made detectors use filters 2012-12-27 18:04:46 +08:00
Henry Mao
e88d2d9ee3 Made stamp work, changed detector to a block 2012-12-27 17:28:28 +08:00
Henry Mao
d4781ab3b0 Fixed detector and improved manipulator 2012-12-27 15:20:28 +08:00
Brian Ricketts
c11a15b6d5 Merged Item Sensor (Sensor) into Assembly Line 
Some errors left to resolve
 2012-12-26 22:10:05 -06:00
Henry Mao
44a84fddd4 Started working on stamper 2012-12-26 20:57:13 +08:00
Henry Mao
1be7f7c403 Crate Item Insert Improvement 2012-12-26 02:40:31 +08:00
Henry Mao
d8f3f065be Improved crate render 2012-12-26 01:50:28 +08:00
Henry Mao
dbdf81601b Texture Update 2012-12-25 02:12:28 +08:00
Henry Mao
8988452c85 Assembly Line 0.1.8. Release 2012-12-24 15:59:22 +08:00
Henry Mao
b32bf79fd3 Minor tweaks and fixes 2012-12-20 01:39:50 +08:00
Henry Mao
46f591a45d Reformat 2012-12-20 00:59:16 +08:00
Henry Mao
17ac65816b Added Rejector to Assembly Net 2012-12-20 00:46:53 +08:00
AtomicStryker
7a7aabb0d7 Updated to 1.4.6 Forge/FML, fixed some refactoring 
Never push code that doesn't compile!
 2012-12-18 22:29:18 +01:00
Henry Mao
4a318d8a9b Allowed manipulator to accept energy transport 2012-12-19 01:12:47 +08:00
Henry Mao
c474055404 Cleaned Up Conveyor Belt 2012-12-18 22:56:45 +08:00
Henry Mao
f1115785e7 Fixed create bug 2012-12-18 22:14:35 +08:00
Henry Mao
eca5490dcb Fixed critial server bug 2012-12-17 09:30:21 +08:00
Henry Mao
f73da078df AL 0.1.7 Release 2012-12-16 23:54:17 +08:00
Henry Mao
1781a35ae4 Fixed crates 2012-12-15 23:29:54 +08:00
Henry Mao
481b0d9852 Assembly Line Release 0.1.6 2012-12-15 21:55:34 +08:00
Henry Mao
c8439b6590 Fixed crates and allowed items to go up and down 2012-12-15 20:56:01 +08:00
Henry Mao
f7968b4729 Belt Direction Fix 2012-12-15 12:53:22 +08:00
Henry Mao
75bf4c9244 Version Bump 2012-12-15 11:48:44 +08:00
Henry Mao
6ef0840fdb Assembly Line Release 0.1.5 
Full log here:
http://calclavia.com/universalelectricity/?m=18&p=changelog
 2012-12-14 23:35:41 +08:00
Henry Mao
d311e58311 Added future multi-lang support 2012-12-14 22:21:52 +08:00
Henry Mao
efc755d77a Updated to Forge 6.4.2 2012-12-14 22:13:14 +08:00
AtomicStryker
5d41e8644d Atomic's Once-over 
See issues for comments
 2012-12-08 18:26:28 +01:00
Henry Mao
232988887a Reformat 2012-11-28 18:29:26 +08:00
Henry Mao
ce66426131 AS 0.1.2 Release 2012-11-17 11:19:22 +08:00
Henry Mao
ee30aad996 Added Architect's Table 2012-11-07 21:10:06 -08:00
Rseifert
2dcac2670b again nothing much 
Just created some files, and fixed a bug with the rejector. Also renamed
the sorter to rejector, since i'm going to create an actual sorter after
i finish the belts. If i find tha time i'll finish the elevator belt
tonight
 2012-11-05 17:14:10 -05:00
Calclavia
57f8a12c6d Added more task related classes 2012-11-03 12:15:29 +08:00
Calclavia
bd78faab1f Reformatted some GUI 2012-11-03 11:56:51 +08:00
Calclavia
cefb0245bd Got rid of TileEntityBase 2012-11-03 11:55:11 +08:00
Rseifert
c97a065429 Finished Sorter GUI 
created a simple GUI to allow for turning off slots, and toggling
rejection state. Also fixed a bug with the rejection checker where it
was always false. Though now i have a bug with the packets never making
i to the server.
 2012-10-31 23:29:31 -04:00
Rseifert
27e43ebfa7 Cleaned up and started on crafters 
I removed some commented out areas from the other files.
Also started on autocrafter at the moment nothing is done just creating
init files, methods, and trying to layout the ground work. Let see if i
can code these cleaner than i usually do he he :)

Also looks like some other things are getting uploaded in this. Might be
a slight version diff in the UE and Buildcraft api version i have. As
well i added the textures to the src folder. Not sure how you mod with
them in the resource folder.
 2012-10-29 13:47:33 -04:00
Calclavia
4242c45a9f Made manipulator output from inventory 2012-10-28 19:54:55 +08:00
Calclavia
edb4234ad0 Massive cleanup to manipulator 2012-10-28 17:21:13 +08:00
Calclavia
ead4de1a27 Moved textures and fixed build file 2012-10-28 16:17:08 +08:00
Calclavia
4bbaded7a4 Enum Organization 2012-10-28 15:47:58 +08:00
Calclavia
cbad7f40cd Added back in textures 2012-10-28 15:19:21 +08:00
Calclavia
e8afe5d767 More fixes 2012-10-28 13:36:34 +08:00