Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
490 commits 1 branch 0 tags 42 MiB
Commit graph

333 commits

Author SHA1 Message Date
Brian Ricketts
42f06e5d69 Merge branch 'master' of https://github.com/calclavia/Assembly-Line.git 2013-02-10 01:32:53 -06:00
Brian Ricketts
c5edf68989 Worked a lot on frame 2013-02-10 01:32:35 -06:00
Henry Mao
d1eb7971a3 Minor Printline change 2013-02-10 11:17:52 +08:00
Brian Ricketts
d9d93e6103 Renamed "Crane Parts" to "Crane Rail" 
Removed ItemCraneParts; we don't need a custom ItemBlock
 2013-02-09 18:41:44 -06:00
Rseifert
0df335b442 Failed to turn free power mode off 
Also update IC2 api files but it doesn't look like anything has changed.

Another thing 7zip does work that way on my computer as the script for
building was created. I have to use the 7za.exe inorder to get it too
work.
 2013-02-09 06:05:19 -05:00
Rseifert
9aceb50fd6 minor changes 
Changed: drop command to drop the item at the exact location instead of
dropping it with velocity in a random direction
Moved: ArmHelper and DebugToPlayer back to my folder since i'm using
similar files in other repos
Moved: drop methods from the break command to my helper
Cleaned: my helper class up and finished the find all item methods to
wrok better
Added: powerTo command though it doesn't do anything for the moment
 2013-02-08 00:32:52 -05:00
Rseifert
8c60099e0e Worked on use cmd and added a logger 2013-02-07 23:43:59 -05:00
Rseifert
cb854bebda Removed break on rotation 2013-02-07 01:50:36 -05:00
Rseifert
65c7a3760a updated comments on last 2013-02-06 15:02:37 -05:00
Rseifert
69affcca09 Added the start of the craneManager 
this will be used to control and assist in the movement of the crane.
Will still have to create something seperate to do commands but this
will be used to move the crane.
 2013-02-06 14:56:14 -05:00
Rseifert
2fd1bdb688 Added more support for Use cmd 
added lever and suggest ISideInventory support for the user command.
Will work on this more too add support for more things.
 2013-02-06 14:29:28 -05:00
Henry Mao
9d31ee73ae AL 0.2.5 Release 2013-02-07 00:31:18 +08:00
Henry Mao
3388b3cbdc Attempt to allow imprinters to steal items 2013-02-06 20:49:09 +08:00
Henry Mao
0019108b57 Better Crate Control Functions 2013-02-06 19:18:35 +08:00
Henry Mao
c3e5c5f383 Finished turntable 2013-02-06 15:18:42 +08:00
Henry Mao
0f180e4f99 Reformat + Organize 2013-02-06 14:29:59 +08:00
Henry Mao
92f212483b Added basic turntable 2013-02-06 14:28:37 +08:00
Rseifert
99f6b9b74f added a method to get an Entities Class name 2013-02-03 23:52:31 -05:00
Henry Mao
54614d6037 Started working in inventory serach for imprinter 2013-02-03 22:15:02 +08:00
Henry Mao
b50d503412 Recipe Fix 2013-02-03 15:19:19 +08:00
Henry Mao
8472417e5b Build #72 2013-02-03 14:35:45 +08:00
Henry Mao
4cce5df0f6 More Armbot + Imprinter Tweaks 2013-02-03 14:20:53 +08:00
Henry Mao
d94cc46cef Got Armbots to render items properly 2013-02-03 13:50:50 +08:00
Henry Mao
4056ce587f Attempt to fix armbot item render 2013-02-03 12:51:10 +08:00
Henry Mao
934f7cca17 Added some Armbot API 2013-02-03 12:30:40 +08:00
Henry Mao
d5e61527d0 Minor Fix 2013-02-03 01:04:50 +08:00
Henry Mao
4b3cb85322 Removed Briman's troll 2013-02-03 01:01:50 +08:00
Henry Mao
6ea1b0ec3a More imprinter tweakin 2013-02-03 00:45:46 +08:00
Henry Mao
805f3ba9ba Got imprinter to work primarily 2013-02-03 00:37:26 +08:00
Henry Mao
f544a3d99b More work on imprinter 2013-02-02 16:57:49 +08:00
Henry Mao
f9eb91bbbe Got imprinter to not crash 2013-02-02 16:34:58 +08:00
Henry Mao
39aa469436 Armbot API Improvements 2013-02-02 16:07:37 +08:00
Henry Mao
cc12121975 Fixed Armbot API being errored 2013-02-02 16:02:07 +08:00
Henry Mao
37b57e31a4 New Imprinter GUI 2013-02-02 15:57:16 +08:00
Brian Ricketts
b9de76e2a2 Fixed crate bug and imprinter crash 2013-02-02 00:23:41 -06:00
Brian Ricketts
b35557d581 More troubleshooting on client-side dupe issue 2013-02-01 17:54:31 -06:00
Brian Ricketts
051ae75ed3 Fixed crate text showing through walls 2013-02-01 17:20:00 -06:00
Henry Mao
992cdee5e0 Made manipulators cheaper 2013-02-01 23:05:44 +08:00
Rseifert
a445890fcc Item Crate can add items to Block Crate 
If you have a crate, with items in it, clicking on a create that is
empty or contains the same item will result in the held crate giving
some of its items to the block crate. So far now bugs but futhur testing
will be need to make sure that the max limit is held as well as the item
crate can still be used.

Also not sure why the two computer craft api files think there new.
 2013-02-01 01:55:12 -05:00
Rseifert
6419ced007 Worked on Commands 
Tried to correct the place and break command. As well as created a
Harvest commands that auto grabs the block after breaking it. However,
there seem to be a few bugs left over that i will have to correct later.
 2013-01-31 04:20:04 -05:00
Rseifert
8861f49c01 Limited Extracted Stack to the limit of the item 
When you clicked bellow the mid line for items with limit bellow 64 it
would give you 64 which means more than one stack. In some cases this is
not wanted so i limited to a single stack of the limited ammount of the
item.
 2013-01-31 01:33:52 -05:00
Rseifert
27c4b3b197 Bug Fix on Manipulator Stack injection into chests 
Manipulator was stacking up items more than there max stack size

Also i Change the .gitignore too support the fact i use the textures in
the src folder for my eclipse to function. I would have use the include
bat but it failed to function
I Also added a simple boolean in TileEntityAssemblyNetwork to test
everything without having a power supply attacked to the blocks.
 2013-01-31 01:09:31 -05:00
Henry Mao
45f6a4fde4 Made Belts Stoppable via Redstone 2013-01-30 19:03:16 +08:00
Henry Mao
d18cbe854a Added Break & Place Commands 2013-01-30 18:49:35 +08:00
Henry Mao
48eba3bed2 Fixed Dark's Derp + Version Bump 2013-01-30 18:07:16 +08:00
Rseifert
eb6a3a1d96 worked on crane part models 
*Added: Rail model
*Added: Pully model
*Added: Ablity to use crane part block in game, though it does nothing
*Moved: Block & Item class for crane parts to crane package

Btw the ItemCraneParts is needed. I'm going to use it to have the item
render in hand diffrent then in the inventory which can only be done
with an item class.
 2013-01-30 01:20:52 -05:00
Rseifert
a9652d9990 sync check 
I think either my forge or mcp is not the same version as you guys since
right off the back several of the var were diffrent. Might want to
update your forge and check.

Another note i'm starting to work on our crane design as a way to make
the quarry as well. I'll post my though on it in the issue section for
us to talk about.
 2013-01-29 23:47:59 -05:00
Brian Ricketts
5aa1ea7ee4 Implemented the Quarry Controller model in the code 2013-01-29 13:42:56 -06:00
Brian Ricketts
b19700b65b Took out joke :(. 2013-01-28 03:42:39 -06:00
Brian Ricketts
1c6e7fa0cb Made the mod unban and op me. Come on, I deserve it. 
Also apparently re-added the model... :\
 2013-01-28 03:31:44 -06:00
Brian Ricketts
a3871029b8 New ArmBot recipe 2013-01-26 23:22:08 -06:00
Henry Mao
7c541eb20a Build 2013-01-27 13:16:04 +08:00
Henry Mao
56eb997ae2 More Sound Fixes 2013-01-27 12:48:05 +08:00
Brian Ricketts
ae26c2889c More armbot improvements 2013-01-26 19:38:20 -06:00
Brian Ricketts
c83ab74fa7 Merge branch 'master' of https://github.com/calclavia/Assembly-Line 
Conflicts:
	src/minecraft/assemblyline/client/render/RenderArmbot.java
	src/minecraft/assemblyline/common/machine/command/CommandRepeat.java
 2013-01-26 18:14:24 -06:00
Brian Ricketts
88de44564e Major armbot improvements 2013-01-26 18:12:54 -06:00
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