mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 20:20:30 +00:00
Code Issues Releases Wiki Activity

Add peripheral_hub type for wired-modem-like peripherals (#1193)

Browse Source 
This allows other mods to create wired-modem alike blocks, which expose
peripherals on the wired network, without having to reimplement the main
modem interface.

This is not currently documented, but a peripheral_hub should provide
the following methods:

 - isPresentRemote
 - getTypeRemote
 - hasTypeRemote
 - getMethodsRemote
 - callRemote
This commit is contained in:
Jonathan Coates 2022-10-29 16:03:05 +01:00 committed by GitHub
parent 97387556fe
commit 1e88d37004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java
View File

@ -72,6 +72,13 @@ public abstract class WiredModemPeripheral extends ModemPeripheral implements IW
protected abstract WiredModemLocalPeripheral getLocalPeripheral(); protected abstract WiredModemLocalPeripheral getLocalPeripheral();
//endregion //endregion
@Nonnull
@Override
public Set<String> getAdditionalTypes()
{
return Collections.singleton( "peripheral_hub" );
}
//region Peripheral methods //region Peripheral methods
/** /**

22
src/main/resources/data/computercraft/lua/rom/apis/peripheral.lua
View File

@ -109,7 +109,7 @@ function getNames()
local side = sides[n] local side = sides[n]
if native.isPresent(side) then if native.isPresent(side) then
table.insert(results, side) table.insert(results, side)
if native.hasType(side, "modem") and not native.call(side, "isWireless") then if native.hasType(side, "peripheral_hub") then
local remote = native.call(side, "getNamesRemote") local remote = native.call(side, "getNamesRemote")
for _, name in ipairs(remote) do for _, name in ipairs(remote) do
table.insert(results, name) table.insert(results, name)
@ -134,9 +134,7 @@ function isPresent(name)
for n = 1, #sides do for n = 1, #sides do
local side = sides[n] local side = sides[n]
if native.hasType(side, "modem") and not native.call(side, "isWireless") and if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
native.call(side, "isPresentRemote", name)
then
return true return true
end end
end end
@ -162,9 +160,7 @@ function getType(peripheral)
end end
for n = 1, #sides do for n = 1, #sides do
local side = sides[n] local side = sides[n]
if native.hasType(side, "modem") and not native.call(side, "isWireless") and if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
native.call(side, "isPresentRemote", peripheral)
then
return native.call(side, "getTypeRemote", peripheral) return native.call(side, "getTypeRemote", peripheral)
end end
end end
@ -195,9 +191,7 @@ function hasType(peripheral, peripheral_type)
end end
for n = 1, #sides do for n = 1, #sides do
local side = sides[n] local side = sides[n]
if native.hasType(side, "modem") and not native.call(side, "isWireless") and if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
native.call(side, "isPresentRemote", peripheral)
then
return native.call(side, "hasTypeRemote", peripheral, peripheral_type) return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
end end
end end
@ -223,9 +217,7 @@ function getMethods(name)
end end
for n = 1, #sides do for n = 1, #sides do
local side = sides[n] local side = sides[n]
if native.hasType(side, "modem") and not native.call(side, "isWireless") and if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
native.call(side, "isPresentRemote", name)
then
return native.call(side, "getMethodsRemote", name) return native.call(side, "getMethodsRemote", name)
end end
end end
@ -265,9 +257,7 @@ function call(name, method, ...)
for n = 1, #sides do for n = 1, #sides do
local side = sides[n] local side = sides[n]
if native.hasType(side, "modem") and not native.call(side, "isWireless") and if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
native.call(side, "isPresentRemote", name)
then
return native.call(side, "callRemote", name, method, ...) return native.call(side, "callRemote", name, method, ...)
end end
end end