6052 Commits

Author SHA1 Message Date
Yibo Cao
58d3c6b45c Fix transferItem checking the wrong side 2018-09-16 23:40:02 -07:00
payonel
f7a1347779 Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
#	src/main/scala/li/cil/oc/server/agent/Player.scala
2018-09-16 20:14:37 -07:00
payonel
2f0e495265 allow force luaj even when natives are available
closes #2880
2018-09-16 00:10:37 -07:00
payonel
4bf8bbbd7f mimic player inventory with back ref to player
also, remove node neighbor check in keyboard, vex didn't like it, also
because it didn't work as intended

closes #2870
2018-09-15 23:00:27 -07:00
payonel
195074678b return bool to lua that the robot really moved
In #2334 it was reported that robot movement can at times return
success even when it didn't move. In addition to that, sangar
had left in comments that sometimes the api calls to move return true
even when they couldn't make the movements, but we don't know why

I was unable to repro this behavior. However, it seems reasonable to
believe that returning success of the api calls ALONG with a check
of the robots current position compared to the requested position it
move to, might be sufficient to correct the result sent to the machine

closes #2334 (probably, maybe)
2018-09-15 01:26:10 -07:00
payonel
202988676f voodoo magic of the dead
Apparently, mob (skeletons, zombies) equipment drops (armor, tools, etc)
were being duplicated as a side effect of the robot kill code when the
robot had no more inventory space to suck up the item. It would seem
that the vanilla mechanic for mobs dropping these special loot items is
different, and somehow oc's robot collect drop code was causing two
items to be created.

Strangely, setDead fixes this and doesn't appear to break anything else!
Very confused why, but, I've tested this and it seems to work. Works
with partial stacks pickups, full inventories, full pickups, and
various mob types

closes #2392
2018-09-15 01:21:15 -07:00
payonel
3228131dbb allow the keyboard to attach to sides
closes #2524
2018-09-13 21:26:59 -07:00
Vexatos
67d352f149 Switched to the correct IC2 dependency. 2018-09-10 19:59:16 +02:00
Vexatos
225e907c49 Replace ChatFormatting with TextFormatting, like it should be.
ChatFormatting only exists on the client side.
Fixes #2792.
Fixes #2850.
2018-09-10 17:56:41 +02:00
payonel
2653f31c98 allow redstone setOutput to specify large values
This appears to work fine with other mods, and with vanilla redstone
tested from 1.7.10 and up.

Also, I reviewed code in other mods setting redstone signals and it
seems that we don't need to cap our redstone signal

Note that this is not an exploit on vanilla redstone, setting output to
2,000 (for example) does not propogate a powered redstone "wire" (dust
line) further than the vanilla 15 blocks. Also, when reading a vanilla
redstone dust line that was powered with a value greater than 15 (e.g.
2,000 again), we do not read huge values either. The vanilla mc system
is capping the values for us.

closes #2058
2018-09-09 19:30:37 -07:00
SquidDev
3374cf45e8 Make cable block highlight hug the block 2018-09-09 17:11:27 -07:00
payonel
5712789c9b Merge branch 'master-MC1.7.10' into master-MC1.10 2018-09-09 16:35:36 -07:00
payonel
a75992e164 type safe check to remove erasure warning 2018-09-09 16:34:17 -07:00
payonel
436bd1808f expose beep pattern api to lua
closes #2716
2018-09-09 14:34:45 -07:00
payonel
7b77dba230 allow processes to handle hard interrupts
no general purpose api at this time

closes #2904
2018-09-08 11:39:37 -07:00
payonel
de3675dd0f Merge branch 'master-MC1.7.10' into master-MC1.10 2018-09-08 00:20:54 -07:00
payonel
bf0fea1354 reduce event delay for term_available, delay rc
Load rc on "init" event
to keep rc load order consistent, move before boot fs event
registrations.

This change allows rc scripts and autoruns to consistently have term io
available
2018-09-08 00:17:53 -07:00
payonel
b65f536257 devfs psuedo files can be zero size 2018-09-05 17:20:19 -07:00
payonel
6591147c15 improved statement parsing, new reset alias
> args can expand to new params
add `reset`, clears screen and sets resolution to max

closes #2642
2018-09-05 15:45:11 -07:00
payonel
68914a63f8 alias more to less --noback
removing more in place of an alias to less
updating man docs to describe value of more over less in low mem cases
adding (END) to less status when the end of a buffer is reached
2018-09-04 16:48:25 -07:00
payonel
399ef4b1ba /bin/less: optimize splits for super long lines 2018-09-04 13:27:10 -07:00
payonel
bb1c97edb4 rework more and less. simpler code, works with long lines payonel 09/04/2018 10:38 AM 2018-09-04 10:39:02 -07:00
payonel
4e5188da08 fix non tty cursor echo and support __call close 2018-09-04 08:44:25 -07:00
payonel
621d1e93e9 Merge branch 'master-MC1.7.10' into master-MC1.10 2018-09-03 16:04:00 -07:00
payonel
afe858ff2d tab complete aliases and improve io.dup efficiency 2018-09-03 16:00:54 -07:00
payonel
428c347897 Merge branch 'master-MC1.7.10' into master-MC1.10 2018-09-02 12:50:08 -07:00
payonel
b493512efd woops, remove test code 2018-09-02 12:42:39 -07:00
payonel
8592cf2f25 cursor echos, io.dup, and remove unused redirect code
io.dup dups a handle, used now by all process creation and redirection
stop sharing cursors with spawned shell procs
write cursor echo to the stdin stream

close #2886
2018-09-02 12:41:38 -07:00
payonel
fcca0cc584 slight bin cleanup 2018-09-01 16:59:40 -07:00
payonel
b6bc9d0cea fixed less, simplified 2018-09-01 16:49:31 -07:00
payonel
1fb05ff432 fix and simplify /bin/more 2018-09-01 15:27:00 -07:00
payonel
65fa68e88e Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/common/IMC.scala
2018-08-31 22:14:54 -07:00
kmecpp
09e0561bac Changed log level of some messages to reduce console spam 2018-08-31 21:45:54 -07:00
payonel
add0e45fc9 Merge branch 'master-MC1.7.10' into master-MC1.10 2018-08-31 20:21:32 -07:00
payonel
ef4bdd363b cherry pick 366d94f08da608d3be30d70ce91e248fa6b4357e to 1.10
Support for the block property system in the geolyzer (closes #2746, #2184)

* works correctly with Beetroot
* supports chorus
* geolyzer.analyze() returns the properties table
* geolyzer.analyze() returns metadata again
* fix warning EventHandlerVanilla.scala: method getBlockHardness in class Block is deprecated
2018-08-31 20:14:09 -07:00
payonel
2483c1d7d8 update cc bundled cable support for 1.10 2018-08-31 19:33:14 -07:00
payonel
1a6756248c openos pre-1.7.3 patching
1. as always, code cleanup and memory savings
2. allow force (-f) option with cp
3. cursor library, separating logic from tty [ the cursor library is robust and heavily tested, but the api is not finalized and is considered beta ]
4. fix autorun on ro fs
5. /bin/ls: run all filesystem calls in lua, safe from c-boundaries
6. vt100: small fix with clear line (1-off error)
2018-08-31 19:33:14 -07:00
SquidDev
5bdbadc125 Add bundled cable support for ComputerCraft 2018-08-31 19:33:14 -07:00
Adrian Siekierka
64035ff0c3 replace hardcoded hookInterval with bogomips calculator 2018-08-31 19:33:14 -07:00
Florian Nücke
be921a2d0f Maven path now via environment variable. 2018-08-31 19:33:14 -07:00
payonel
95598f6262 should check timeout before blinking 2018-08-31 19:33:14 -07:00
payonel
ec0d879bfb new cursor lib, some vt100 fixes for windows
the cursor lib will probably become an official api, but not yet, still in beta
an application can define its own cursor, can handle the following methods
Here is a rough draft of the api, when it is official there will be an ocdoc article covering this
echo
  Echo does not change the input buffer, does not move the relative cursor position to the input, in is only used for updating the UI. Echo will receive the following
 "": scroll if needed
 nil: initialize blink if needed
 boolean: toggle blink if true, force blink off if false
 string: write string to output stream
 keyboard.keys.right and keyboard.keys.left: move the visual cursor left or right. scroll if necessary
move
  number: Intended to move the logical cursor relative to its current input. Should call echo for visual movement
update
  string: add (prepend, insert, or append) text to the input buffer
  number: remove (backspace, delete) text from the input buffer
  should call move if the cursor moves due to the text changes
handle
  (name, char, code): called in response to event signals when waiting for input. Typically this is used to handle key_down, touch, drag, and clipboard
  return nil if the cursor is closing
  return false if the input is interrupted
  return true if the input is not done
  return <string> as the result of the input when completed
2018-08-31 19:33:14 -07:00
payonel
ff8323c447 bit32 should always be require(), regardless of arch
too bad we weren't clearing it from _G on boot, else we would have seen this bug
i'm choosing to NOT clear in from _G on boot .. for now ..
2018-08-31 19:33:14 -07:00
payonel
541e765d7b need to close process after error handling 2018-08-31 19:33:14 -07:00
payonel
ab10c8738f log rc errors to /tmp/event.log
closes #2787
2018-08-31 19:33:14 -07:00
payonel
943f3c2339 make cursor echo safe to call even without gpu ready 2018-08-31 18:09:28 -07:00
payonel
7827f77680 maven publishing config fix 2018-08-27 13:26:31 -07:00
payonel
e5aa71dc52 reducing build.gradle 2018-08-27 10:23:17 -07:00
payonel
758dfed35e reduced gradle - all deps hosted on single maven 2018-08-25 08:22:49 -07:00
payonel
9b12c1e350 openos pre-1.7.3 patching
1. as always, code cleanup and memory savings
2. allow force (-f) option with cp
3. cursor library, separating logic from tty [ the cursor library is robust and heavily tested, but the api is not finalized and is considered beta ]
4. fix autorun on ro fs
5. /bin/ls: run all filesystem calls in lua, safe from c-boundaries
6. vt100: small fix with clear line (1-off error)
2018-08-23 23:16:12 -07:00