6373 Commits

Author SHA1 Message Date
payonel
c7ec8b971c keep frequency owner 2018-11-06 23:17:46 -08:00
payonel
2d3d95fadb Merge branch 'master-MC1.11' into master-MC1.12 2018-11-06 22:37:12 -08:00
payonel
b511fdce9c Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/scala/li/cil/oc/integration/enderstorage/DriverFrequencyOwner.java
2018-11-06 22:35:15 -08:00
payonel
6f66d5272b credit to amesgen, enderstorage setFrequency
apparently in 1.10 it is proper to call setFrequence a bit differently

closes #2802
closes #2803
2018-11-06 22:17:09 -08:00
payonel
7ef15e5b12 Merge branch 'master-MC1.11' into master-MC1.12 2018-11-06 20:16:54 -08:00
payonel
ad050fde4b Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/resources/assets/opencomputers/recipes/default.recipes
2018-11-06 20:16:37 -08:00
payonel
731b125d72 sensor lens item name in 1.10
closes #2446
2018-11-06 20:13:08 -08:00
payonel
89d305ca7b Merge branch 'master-MC1.11' into master-MC1.12 2018-11-06 00:59:51 -08:00
payonel
538419e375 Merge branch 'master-MC1.10' into master-MC1.11 2018-11-06 00:59:42 -08:00
payonel
c36118c75f Merge branch 'master-MC1.7.10' into master-MC1.10 2018-11-06 00:58:15 -08:00
payonel
2256adf30c protect lock data from being overwritten 2018-11-06 00:56:13 -08:00
payonel
3168deb974 Merge branch 'master-MC1.11' into master-MC1.12
# Conflicts:
#	src/main/scala/li/cil/oc/common/item/traits/FileSystemLike.scala
2018-11-06 00:48:14 -08:00
payonel
9e910060e2 Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
#	src/main/scala/li/cil/oc/Localization.scala
#	src/main/scala/li/cil/oc/client/gui/Drive.scala
#	src/main/scala/li/cil/oc/server/PacketHandler.scala
#	src/main/scala/li/cil/oc/server/component/Drive.scala
2018-11-06 00:47:13 -08:00
payonel
4849ca425c lock only with player, and stop lock overwrite 2018-11-06 00:13:33 -08:00
payonel
562ff0e30f Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/client/gui/Drive.scala
#	src/main/scala/li/cil/oc/common/item/data/DriveData.scala
#	src/main/scala/li/cil/oc/server/PacketHandler.scala
#	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
2018-11-06 00:06:35 -08:00
payonel
2611ecb265 new filesystem device feature, locked mode
A locked filesystem is readonly (in either managed or unmanaged modes)
It cannot be unlocked unless its mode is switched or it is recrafted -
both actions wipe the drive. The data is thus "locked" or protected
unless the drive is wiped. The player's displace name is also recorded
and shown in tooltips on the device to indicate who locked it. In this
manner, data authenticity can be trusted

closes #2138
2018-11-05 23:58:58 -08:00
Joseph C. Sible
b74a8037e7 Add "leashHolder" as a name
`field_110168_bw` was remapped from `leashedToEntity` to `leashHolder` as of the 20170919 mappings. Add this name so that the dev environments of other mods that use these mappings will work without "There were errors running the class transformer" messages.
2018-11-04 16:44:52 -08:00
payonel
eaf2738c00 Merge branch 'master-MC1.11' into master-MC1.12 2018-11-04 12:27:33 -08:00
payonel
4b8776f63b Merge branch 'master-MC1.10' into master-MC1.11 2018-11-04 12:27:22 -08:00
payonel
8e31e73b09 Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
2018-11-04 12:27:08 -08:00
payonel
ed99a18944 include internal components for adapter onAnalyze
closes #2977
2018-11-04 12:26:07 -08:00
payonel
80f6d592ab apparently things change names when obfuscated
closes #2974
2018-11-03 21:13:17 -07:00
payonel
23500a50b7 Merge branch 'master-MC1.11' into master-MC1.12 2018-11-03 19:16:04 -07:00
payonel
b604e52a43 Merge branch 'master-MC1.10' into master-MC1.11 2018-11-03 19:08:45 -07:00
payonel
df7825dcf2 Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/RedstoneBundled.scala
2018-11-03 18:54:51 -07:00
payonel
8149f0eb8e build fix (https for forge) and AnyRef fix 2018-11-03 18:53:58 -07:00
payonel
7b02269240 Merge branch 'master-MC1.11' into master-MC1.12
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
2018-11-03 15:28:32 -07:00
payonel
67c4ddde43 Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
#	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/RobotProxy.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/integration/bluepower/BundledRedstoneDevice.scala
#	src/main/scala/li/cil/oc/integration/bluepower/RedstoneDevice.scala
#	src/main/scala/li/cil/oc/integration/computercraft/BundledRedstoneProvider.scala
#	src/main/scala/li/cil/oc/integration/enderio/ProviderEnderIO.scala
#	src/main/scala/li/cil/oc/integration/mcmp/PartPrint.scala
2018-11-03 15:21:21 -07:00
payonel
ade302d15c Merge branch 'master-MC1.7.10' into master-MC1.10
# Conflicts:
#	src/main/scala/li/cil/oc/client/PacketHandler.scala
#	src/main/scala/li/cil/oc/common/block/RedstoneAware.scala
#	src/main/scala/li/cil/oc/common/tileentity/Charger.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/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/integration/computercraft/BundledRedstoneProvider.scala
#	src/main/scala/li/cil/oc/server/PacketSender.scala
2018-11-03 14:12:12 -07:00
payonel
e67d00221b redstone api overrides, backwards compatible
Providing the following overrides:

getInput(side: number): number
getInput(): table

setOutput(side, number): number
setOutput(values: table): table

getBundledInput(side: number, color: number): number
getBundledInput(side: number): table
getBundledInput(): table

getBundledOutput(side: number, color: number): number
getBundledOutput(side: number): table
getBundledOutput(): table

setBundledOutput(side: number, color: number, value: number): number
setBundledOutput(side: number, values: table): table
setBundledOutput(values: table): table

closes #2539
2018-11-03 11:06:59 -07:00
payonel
a8336f2d69 thanatos corrected a typo 2018-10-31 11:35:00 -07:00
AntiBlueQuirk
03c24eff01 Adding Cut/Uncut operations 2018-10-31 11:09:35 -07:00
payonel
7faadb53ea Merge branch 'master-MC1.11' into master-MC1.12 2018-10-31 03:12:10 -07:00
payonel
8612a1aa4f Merge branch 'master-MC1.10' into master-MC1.11 2018-10-31 03:08:03 -07:00
payonel
904990f294 Merge branch 'master-MC1.7.10' into master-MC1.10 2018-10-31 03:07:46 -07:00
payonel
d249367ee9 fix: a.onDisconnect(a) isn't called on components by microcontroller 2018-10-31 02:43:35 -07:00
svitoos
e85f3e1f83 Improved chunkloader upgrade by svitoos
change reduced by payonel

Namely:

- moving setting for chunkloaders, svitoos choice was cleaner
- allowing chunkloaders in microcontrollers

Closes #2499.
2018-10-31 02:42:57 -07:00
payonel
d59db2990b add Forge Energy support
1. battery upgrades, tablets, and hover boots can be charged in Forge
Energy compatible devices, such as Thermal Expansion's Energetic Infuser

2. battery upgrades also support power extraction, allowing them to
recharge Forge Energy devices (in the battery slot)

more than closes #2687
2018-10-30 23:26:00 -07:00
payonel
8a450d2634 Merge branch 'master-MC1.11' into master-MC1.12 2018-10-29 23:16:45 -07:00
payonel
d388a31415 Merge branch 'master-MC1.10' into master-MC1.11 2018-10-29 23:16:34 -07:00
payonel
82c486ffba Merge branch 'master-MC1.7.10' into master-MC1.10 2018-10-29 23:16:14 -07:00
payonel
9b7d125ebb add disk_drive.media(), get floppy disk address
closes #2972
2018-10-29 23:03:13 -07:00
payonel
e7eddad588 add proper support for \b and \r. ignore \15
closes #2971
2018-10-29 21:59:58 -07:00
payonel
89c8885624 add a AgentContainer to improve item use detection
This new AgentContainer provides slots for all agent inventory items so
that proper change detection can occur for using items

properly closes #2327
2018-10-29 21:42:14 -07:00
payonel
4ff26e91a0 fix more inventory interactions
1. the agent armor inventory maps to the player equipment inventory.
previously we have been preparing only the first(0) equipment(belt) item
out of robots/drones for inventory interactions. but the player
inventory has 4 slots for the armor set, enough room to represent all
of the belt from the agent. This change prepares all 4 armor positions.

2. when our player inventory is modified via the our container slots the
agent inventory is updated. this causes underlying player inventory
lists to thus become outdated. We can detect these changes by hooking
into a listener that will notify us when slots change the agents, thus
allowing us to keep the player inventory lists updated. When an
operation on the inventory container is done, we are then up to date
between the agent and the player

3. Previously we had been holding the active slot index contents in a
private offHand tuple, and previously when the item action had completed
we would detect changes to the offHand data. This extra field wasn't
needed, this change just uses the offhand inventory.

4. cleaned up wasteful code in InventoryUtils.insertIntoInventory

todo: the inventory container is a PlayerContainer, which builds various
slots we never need, and not enough slots. This causes the slot change
detection code to only cover a tiny subset of agent slots

note: the offhand solution isn't infallable. what if an item is
naturally supposed to create duplicate of itself on use. the dup would
stack with the originating slot, and the offhand data would overwrite it
when the item use action completed. but this is unlikely. a solution
would require a truly blocking item be put in place of the originating
slot as a placeholder for when the offhand action completed.
2018-10-29 18:41:33 -07:00
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