6143 Commits

Author SHA1 Message Date
svitoos
2c2b9712ea 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 19:31:51 -07:00
payonel
a85fe69692 using java 7 syntax to fix our IDEA builds 2018-08-30 12:45:11 -07:00
payonel
5a914d9cf9 Merge branch 'master-MC1.11' into master-MC1.12
# Conflicts:
#	build.gradle
2018-08-30 09:55:17 -07:00
payonel
a1cac639e3 Revert "idea build fix for scala with java 1.8"
This reverts commit 50da23baa7edb41ce6232dd8a107ebadc2606ef4.
2018-08-30 09:51:29 -07:00
payonel
61dc91350a skipping 1.11 cc support 2018-08-29 03:18:10 -07:00
payonel
e8ba939a33 Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	build.gradle
#	src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala
2018-08-29 02:55:38 -07:00
payonel
7dc1622a0e update cc bundled cable support for 1.10 2018-08-29 02:36:59 -07:00
payonel
e2307316ee Merge branch 'master-MC1.7.10' into master-MC1.10 2018-08-29 02:06:52 -07:00
payonel
50da23baa7 idea build fix for scala with java 1.8 2018-08-29 00:42:55 -07:00
payonel
99d2e4a4a8 reduce gradle 2018-08-27 15:06:55 -07:00
payonel
91f0a0da3e maven publish fix 2018-08-27 14:47:25 -07:00
payonel
9c40a36099 reduce maven repos to oc only 2018-08-27 14:42:42 -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
asie
191d235882 fix deprecations in JEI, update libraries 2018-07-05 10:41:01 -07:00
Wrothmonk
8d88844b07 Proper .prop file recognition
Install would only check .prop files at the root of a device instead of the actual path where the installation is coming from. This would cause issues with the --from option if it was targeted at anything other than the root of a filesystem.
2018-07-04 16:22:56 -07:00
Galacticraft developer
21c49987e1 Correct name for Galacticraft item in recipe for World Sensor Card 2018-07-04 16:20:14 -07:00
3TUSK
04423bda75 Update zh_CN.lang 2018-07-04 16:13:00 -07:00
3TUSK
64e88791c0 Update zh_CN.lang 2018-07-04 16:13:00 -07:00
Thiakil
81840790ab fix Extracells & mekanism deps. Fixes #2855 2018-07-04 16:12:33 -07:00
Adrian Siekierka
088964b168 fix #2858 (#2882) 2018-07-04 20:51:46 +02:00
SquidDev
2b0215bdbc Add bundled cable support for ComputerCraft 2018-07-04 08:56:34 -07:00
Adrian Siekierka
daff228f85 replace hardcoded hookInterval with bogomips calculator 2018-07-04 08:56:13 -07:00
Florian Nücke
cca7f202d5 Maven path now via environment variable. 2018-05-26 22:05:04 +02:00
Florian Nücke
8cef1a5624 Fixed a couple of inverted return values for power charge callbacks. All of these are expected to return the remainder of the delta that could *not* be applied (that's how it's used anyway, in the Charger). Most implementations do this correctly, but a few did not, in particular the Minecraft Forge Energy one. Also a couple of defaults returned the incorrect value as well (e.g. when stack is empty and such). 2018-04-30 16:57:19 +02:00
payonel
a28a1aa2a5 should check timeout before blinking 2018-03-31 17:38:12 -07:00
payonel
a80f6363d5 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-03-31 17:15:41 -07:00
payonel
9cdbaed1f5 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-03-29 13:45:26 -07:00
payonel
4ec7254e94 need to close process after error handling 2018-03-24 21:38:05 -07:00
payonel
aae7029dbe log rc errors to /tmp/event.log
closes #2787
2018-03-20 19:30:00 -07:00
payonel
ac67d8ba37 Merge branch 'master-MC1.11' into master-MC1.12 2018-03-20 14:17:56 -07:00
payonel
d3abf39e94 item stack usage changes fix
NonNullList::get(index) instead of array syntax (index)
and shrink(count) instead of directly adjusting the stackSize field

fixes build errors
2018-03-20 14:17:33 -07:00
payonel
74041d2d6e Merge branch 'master-MC1.11' into master-MC1.12 2018-03-20 13:24:38 -07:00
payonel
aaa6b0d012 Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/scala/li/cil/oc/common/GuiHandler.scala
2018-03-20 12:58:59 -07:00
payonel
ba725c03b5 Merge branch 'master-MC1.11' into master-MC1.12 2018-03-20 12:36:03 -07:00
payonel
648cdf78aa use ItemStack.EMPTY since 1.11 and not nulls
robot.use() was using a null pointer when not holding any item

closes #2786
2018-03-20 12:34:32 -07:00
payonel
23507d5c77 fix offhand actions
with tablets, databases, server racks, and disk drives

closes #1897
2018-03-19 21:29:13 -07:00
payonel
c79d9042cc Merge branch 'master-MC1.11' into master-MC1.12 2018-03-18 23:21:08 -07:00
payonel
9543ac8168 remove file accidentally added back by merge 2018-03-18 23:19:41 -07:00
payonel
ac400a5485 Merge branch 'master-MC1.11' into master-MC1.12 2018-03-18 23:07:27 -07:00
payonel
5c116c5ccf Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/scala/li/cil/oc/common/container/Player.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
#	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
#	src/main/scala/li/cil/oc/server/component/RedstoneSignaller.scala
#	src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2018-03-18 23:06:52 -07:00
payonel
6130d0adc6 Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/common/container/Player.scala
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Print.scala
#	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
#	src/main/scala/li/cil/oc/common/tileentity/Redstone.scala
#	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
#	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
#	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
#	src/main/scala/li/cil/oc/server/component/RedstoneVanilla.scala
#	src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
2018-03-18 23:06:08 -07:00
payonel
abe18ad535 add detect to geolyzer
this commit also fixes some positional issues with geolyzer and canSeeSky when used as an internal component with tablets and drones

this commit also adds the hover tier 2 upgrade to the creatix robot

closes #1863
2018-03-18 01:09:45 -07:00
payonel
8cac5dfcd3 add isSunVisible and canSeeSky to the geolyzer
this is a potential solution to robots that need to know if their solar panels are able to charge
if a geolyzer is also added to a robot, it can use the geolyzer component to check for charge options

issue #1778 specifically asked for similar api on the solar upgrade, but we didn't want to make the solar upgrade a component. Doing so would increase the component load of existing robots, which could cause existing robots to simply fail.

thus this is a compromise to that request

closes #1778
2018-03-17 20:46:30 -07:00
payonel
4a83d4426d allow the robot to swing at anything that would block its movement
closes #1840
2018-03-17 19:58:23 -07:00
payonel
0095f33522 cleanup 2018-03-16 19:45:45 -07:00
payonel
37c3ddaf91 slot tier weighted fill
closes #1658
2018-03-16 19:45:39 -07:00
payonel
c69c9e6748 returning just the first value of debug getlocal and getupvalue
the suggested access was to return nil always as the value, but these values aren't nil, and I felt it reasonable to return at least the variable name and not mislead that the value was nil

closes #1607
2018-03-14 23:31:43 -07:00