diff --git a/build.properties b/build.properties index 50f0c35e7..dd3a519c5 100644 --- a/build.properties +++ b/build.properties @@ -9,8 +9,8 @@ bc.version=7.0.9 bloodmagic.cf=2223/203 bloodmagic.version=1.3.0a-1 bluepower.version=0.2.928 -cc.cf=2216/236 -cc.version=1.65 +cc.cf=2228/723 +cc.version=1.73 ccl.version=1.1.1.104 cofhlib.cf=2230/207 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 nei.version=1.0.3.57 nek.version=1.0.0b35dev -projred.version=4.5.8.59 +projred.version=4.7.0pre2.87 qmunitylib.version=0.1.105 rc.cf=2219/321 rc.version=1.7.10-9.4.0.0 diff --git a/src/main/scala/li/cil/oc/common/item/Wrench.scala b/src/main/scala/li/cil/oc/common/item/Wrench.scala index 45baf70c8..96382f4ca 100644 --- a/src/main/scala/li/cil/oc/common/item/Wrench.scala +++ b/src/main/scala/li/cil/oc/common/item/Wrench.scala @@ -76,8 +76,14 @@ class Wrench extends traits.SimpleItem with api.internal.Wrench { // Project Red + def canUse(entityPlayer: EntityPlayer, itemStack: ItemStack): Boolean = true + + // pre v4.7 def damageScrewdriver(world: World, player: EntityPlayer): Unit = {} + // v4.7+ + def damageScrewdriver(player: EntityPlayer, stack: ItemStack): Unit = {} + // Railcraft def canWhack(player: EntityPlayer, stack: ItemStack, x: Int, y: Int, z: Int): Boolean = true diff --git a/src/main/scala/li/cil/oc/integration/Mods.scala b/src/main/scala/li/cil/oc/integration/Mods.scala index 2f7816eee..97b410ff7 100644 --- a/src/main/scala/li/cil/oc/integration/Mods.scala +++ b/src/main/scala/li/cil/oc/integration/Mods.scala @@ -32,7 +32,7 @@ object Mods { val CoFHItem = new SimpleMod(IDs.CoFHItem) val CoFHTileEntity = new SimpleMod(IDs.CoFHTileEntity) 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 DeepStorageUnit = new ClassBasedMod(IDs.DeepStorageUnit, "powercrystals.minefactoryreloaded.api.IDeepStorageUnit")() val ElectricalAge = new SimpleMod(IDs.ElectricalAge, providesPower = true) diff --git a/src/main/scala/li/cil/oc/integration/computercraft/DriverPeripheral.java b/src/main/scala/li/cil/oc/integration/computercraft/DriverPeripheral.java index 4fa8d96d6..e8c9b3013 100644 --- a/src/main/scala/li/cil/oc/integration/computercraft/DriverPeripheral.java +++ b/src/main/scala/li/cil/oc/integration/computercraft/DriverPeripheral.java @@ -3,6 +3,7 @@ package li.cil.oc.integration.computercraft; import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IWritableMount; import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.ILuaTask; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -239,6 +240,16 @@ public final class DriverPeripheral implements li.cil.oc.api.driver.Block { 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 public Object[] pullEvent(final String filter) throws LuaException, InterruptedException { throw new UnsupportedOperationException();