AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated Project Red and ComputerCraft dependencies and adjusted implementations of interfaces as necessary. Closes #1231.

Browse Source
This commit is contained in:
Florian Nücke 2015-06-20 16:51:24 +02:00
parent 1e5b2bdbaf
commit 3bea675494
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.properties
View File

@ -9,8 +9,8 @@ bc.version=7.0.9
bloodmagic.cf=2223/203 bloodmagic.cf=2223/203
bloodmagic.version=1.3.0a-1 bloodmagic.version=1.3.0a-1
bluepower.version=0.2.928 bluepower.version=0.2.928
cc.cf=2216/236 cc.cf=2228/723
cc.version=1.65 cc.version=1.73
ccl.version=1.1.1.104 ccl.version=1.1.1.104
cofhlib.cf=2230/207 cofhlib.cf=2230/207
cofhlib.version=[1.7.10]1.0.0RC7-127 cofhlib.version=[1.7.10]1.0.0RC7-127
@ -32,7 +32,7 @@ mfr.cf=2229/626
mfr.version=[1.7.10]2.8.0RC8-86 mfr.version=[1.7.10]2.8.0RC8-86
nei.version=1.0.3.57 nei.version=1.0.3.57
nek.version=1.0.0b35dev nek.version=1.0.0b35dev
projred.version=4.5.8.59 projred.version=4.7.0pre2.87
qmunitylib.version=0.1.105 qmunitylib.version=0.1.105
rc.cf=2219/321 rc.cf=2219/321
rc.version=1.7.10-9.4.0.0 rc.version=1.7.10-9.4.0.0

6
src/main/scala/li/cil/oc/common/item/Wrench.scala
View File

@ -76,8 +76,14 @@ class Wrench extends traits.SimpleItem with api.internal.Wrench {
// Project Red // Project Red
def canUse(entityPlayer: EntityPlayer, itemStack: ItemStack): Boolean = true
// pre v4.7
def damageScrewdriver(world: World, player: EntityPlayer): Unit = {} def damageScrewdriver(world: World, player: EntityPlayer): Unit = {}
// v4.7+
def damageScrewdriver(player: EntityPlayer, stack: ItemStack): Unit = {}
// Railcraft // Railcraft
def canWhack(player: EntityPlayer, stack: ItemStack, x: Int, y: Int, z: Int): Boolean = true def canWhack(player: EntityPlayer, stack: ItemStack, x: Int, y: Int, z: Int): Boolean = true

2
src/main/scala/li/cil/oc/integration/Mods.scala
View File

@ -32,7 +32,7 @@ object Mods {
val CoFHItem = new SimpleMod(IDs.CoFHItem) val CoFHItem = new SimpleMod(IDs.CoFHItem)
val CoFHTileEntity = new SimpleMod(IDs.CoFHTileEntity) val CoFHTileEntity = new SimpleMod(IDs.CoFHTileEntity)
val CoFHTransport = new SimpleMod(IDs.CoFHTransport) val CoFHTransport = new SimpleMod(IDs.CoFHTransport)
val ComputerCraft = new SimpleMod(IDs.ComputerCraft) val ComputerCraft = new SimpleMod(IDs.ComputerCraft, version = "@[1.73,)")
val CraftingCosts = new SimpleMod(IDs.CraftingCosts) val CraftingCosts = new SimpleMod(IDs.CraftingCosts)
val DeepStorageUnit = new ClassBasedMod(IDs.DeepStorageUnit, "powercrystals.minefactoryreloaded.api.IDeepStorageUnit")() val DeepStorageUnit = new ClassBasedMod(IDs.DeepStorageUnit, "powercrystals.minefactoryreloaded.api.IDeepStorageUnit")()
val ElectricalAge = new SimpleMod(IDs.ElectricalAge, providesPower = true) val ElectricalAge = new SimpleMod(IDs.ElectricalAge, providesPower = true)

11
src/main/scala/li/cil/oc/integration/computercraft/DriverPeripheral.java
View File

@ -3,6 +3,7 @@ package li.cil.oc.integration.computercraft;
import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IMount;
import dan200.computercraft.api.filesystem.IWritableMount; import dan200.computercraft.api.filesystem.IWritableMount;
import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.lua.ILuaTask;
import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheral;
@ -239,6 +240,16 @@ public final class DriverPeripheral implements li.cil.oc.api.driver.Block {
return Instance; return Instance;
} }
@Override
public long issueMainThreadTask(ILuaTask task) throws LuaException {
throw new UnsupportedOperationException();
}
@Override
public Object[] executeMainThreadTask(ILuaTask task) throws LuaException, InterruptedException {
throw new UnsupportedOperationException();
}
@Override @Override
public Object[] pullEvent(final String filter) throws LuaException, InterruptedException { public Object[] pullEvent(final String filter) throws LuaException, InterruptedException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();