AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 10:21:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,328 Commits 29 Branches 143 Tags
Commit Graph

6328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
ef2f45b7a0 allow host to build component list even if off 
fixes confusing analyzer report. when you place a case in the world and
add components, even while the case is off it correctly reports its
internal component max. But when loading a world, cases that are not
running will have a 0 component max according to the analyzer. This
inaccurate limit is fixed when the case is turned on
 2018-10-29 17:37:23 -07:00
payonel
9d4826d070 rework useEquippedItem to use formal use api 
by using the more formal set of start and stop using item calls, this
fixes using some items that require a start and stop with duration such
as the tinker bow

closes #2752
 2018-10-28 11:41:28 -07:00
payonel
7209457d62 mimic orb xp pickup (with exp upgrade) 
When a robot or drone with an experience upgrade gains experience,
either through actions or breaking blocks that drop xp, the agent will
now also mimic orb xp behavior, which may be utilized by tools such as
the tinker tools with moss mending.

also, fix exp upgrade check for item upgrade

closes #2506
 2018-10-28 01:40:45 -07:00
payonel
7ffc9525a4 Merge branch 'master-MC1.11' into master-MC1.12 2018-10-28 00:23:48 -07:00
payonel
0944e2e578 Merge branch 'master-MC1.10' into master-MC1.11 2018-10-28 00:23:41 -07:00
payonel
dc0f187a83 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
 2018-10-28 00:23:27 -07:00
payonel
ad8218a2ea fix the chunkloader upgrade i just broke 2018-10-28 00:22:15 -07:00
payonel
79a632e9f2 ae2 startup fix 2018-10-27 23:36:35 -07:00
payonel
ea9b6b1559 Merge branch 'master-MC1.11' into master-MC1.12 2018-10-27 23:15:10 -07:00
payonel
f301f931e2 Merge branch 'master-MC1.10' into master-MC1.11 2018-10-27 23:08:42 -07:00
payonel
3be48ae4d5 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
 2018-10-27 23:03:33 -07:00
payonel
a0821f1493 add white/blacklist option for chunkloading 
new settings options: misc.chunkloaderDimensionBlacklist and
misc.chunkloaderDimensionWhitelist

closes #2768
 2018-10-27 22:55:12 -07:00
payonel
8940388cb7 adding interaction helper 
1. solves issue with digging state of the manager
2. solves issue with xp pickup
3. solves issue with digSpeed not matching our calculations

this bring robot swing code in uniform with a natural player clickBlock

closes #2167
 2018-10-27 17:26:26 -07:00
payonel
d50843ae7e robot swing refactor wip 
fixes tinker hammer aoe block break, closes #2167
 2018-10-27 09:18:39 -07:00
payonel
8cf10863cc perhaps a better fix for ae 
closes #2961
 2018-10-25 03:20:10 -07:00
payonel
ac2e734547 fix some ae2 integration api 
partially resolves #2961 but we have a jnlua issue with iterating lua 5.3 tables
 2018-10-22 23:06:25 -07:00
payonel
0ec817ff2b update ae2 gridnode when world is set, not on load 2018-10-22 01:59:20 -07:00
payonel
218792270f Merge branch 'master-MC1.11' into master-MC1.12 2018-10-21 23:21:25 -07:00
payonel
20b672eb62 Merge branch 'master-MC1.10' into master-MC1.11 2018-10-21 23:20:14 -07:00
payonel
e967432627 Merge branch 'master-MC1.7.10' into master-MC1.10 2018-10-21 23:18:48 -07:00
payonel
1e35f8e49a connect internal nodes created from side effects 
it has been found that a screen placed below a case can be connected
the the case before the case's internal components have been added to
a network. This causes the screen to miss its chance to connect to the
gpu, causing the gpu's bound screen to be unavailable, and gpu api
calls will error

This is likely the root cause for many "stalled" or crashed when
restarting servers, or chunks loading

closes #2962
 2018-10-21 23:15:56 -07:00
payonel
c360209df8 Merge branch 'master-MC1.11' into master-MC1.12 
add back in enderstorage support for 1.12
 2018-10-12 22:10:08 -07:00
payonel
de40f47a42 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/enderstorage/DriverFrequencyOwner.java
#	src/main/scala/li/cil/oc/server/component/LinkedCard.scala
#	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
 2018-10-12 18:17:00 -07:00
payonel
4fd0399ad5 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
#	src/main/scala/li/cil/oc/common/tileentity/Waypoint.scala
#	src/main/scala/li/cil/oc/integration/enderstorage/DriverFrequencyOwner.java
#	src/main/scala/li/cil/oc/server/component/LinkedCard.scala
#	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
 2018-10-12 17:38:24 -07:00
payonel
6d5dd948b5 add wake message support to link cards 
same api as network card

closes #2753
 2018-10-12 14:05:33 -07:00
payonel
cc0fddb914 allow setFrequency on owned ender storage chests 
ender storage, the mod itself, lets players change frequency of owned
chests without any type of owner check

closes #2775
 2018-10-12 12:24:36 -07:00
payonel
4731cb1b01 add recrafting option to link 2 link cards 
also, clean up the net_splitter.getSides() return, it should use the
exact same index values you need to use in setSides.

added getChannel() on link cards. Link cards of the same channel are
linked in the same network. Also inventory controllers can read this as
the `linkChannel` from the item

closes #2400
 2018-10-12 10:07:30 -07:00
payonel
6182fde957 allow waypoints to face UP or DOWN 
the block faces up or down, depending on the pitch of your cross-hair
when you place the block down, just like screens

closes #2364
 2018-10-12 01:13:29 -07:00
payonel
904db35be2 platter size an even factor for unmanaged disks 
closes #2305
 2018-10-11 23:46:13 -07:00
payonel
2d2c6feb1a use less disruptive particles for nanomachines 
closes #2773
 2018-10-11 16:29:53 -07:00
payonel
243b0aa910 Merge branch 'master-MC1.11' into master-MC1.12 2018-10-10 17:16:59 -07:00
payonel
e0ebfed999 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/GuiHandler.scala
 2018-10-10 17:16:41 -07:00
payonel
0c4d10ee1f main hand mountable disk drive open gui fix 2018-10-10 17:15:39 -07:00
payonel
10420b3a4f Merge branch 'master-MC1.11' into master-MC1.12 2018-10-10 01:41:39 -07:00
payonel
af9bdbef15 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
 2018-10-10 01:41:14 -07:00
payonel
454e091959 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
#	src/main/scala/li/cil/oc/common/tileentity/NetSplitter.scala
 2018-10-10 01:35:29 -07:00
payonel
a5b6e3fec3 honor enableNanomachinePfx when false 
also the distance check for nanomachine wireless comm was perhaps
not as intended. this change increases the range by correctly computing
the distance

closes #2505
 2018-10-10 00:38:26 -07:00
payonel
1301ed8c3d meant to name it net_splitter 2018-10-09 22:36:00 -07:00
payonel
4142e09671 new net_splitter component with api 
getSides, setSides, open, and close

closes #2531
 2018-10-09 22:34:51 -07:00
payonel
2f27a5cc36 provide more ItemStack data for draconic evolution 
closes #2621
 2018-10-07 10:49:08 -07:00
payonel
64bcbff3b3 Merge branch 'master-MC1.11' into master-MC1.12 2018-10-06 19:13:03 -07:00
payonel
6864b2c4f1 Merge branch 'master-MC1.10' into master-MC1.11 2018-10-06 19:08:36 -07:00
payonel
3968301277 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
 2018-10-06 18:56:34 -07:00
payonel
fd3ba6a55e add scanContentsAt debug card method 2018-10-06 18:32:10 -07:00
payonel
f5f3042e32 Merge branch 'master-MC1.11' into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala
 2018-10-06 11:56:52 -07:00
payonel
8d31c3df77 Merge branch 'master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/resources/mcmod.info
 2018-10-06 11:56:09 -07:00
payonel
837edf6029 Merge branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/Trade.scala
#	src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala
 2018-10-06 11:53:40 -07:00
payonel
80a742c304 change variable case to match others 2018-10-06 11:48:45 -07:00
payonel
93d72aaa59 check for null on node connections 
closes #2952
 2018-10-06 11:32:48 -07:00
payonel
59d663a2ed fix llama crash 
closes #2954
 2018-10-05 20:21:57 -07:00