diff --git a/build.properties b/build.properties index fb90e3522..f53bedaf2 100644 --- a/build.properties +++ b/build.properties @@ -1,19 +1,19 @@ -minecraft.version=1.12.1 -minecraft.mappings=snapshot_20170812 -forge.version=14.22.0.2452 +minecraft.version=1.12.2 +minecraft.mappings=snapshot_20180213 +forge.version=14.23.2.2616 mod.name=OpenComputers mod.group=li.cil.oc mod.version=1.7.1 -ae2.version=rv5-stable-2 +ae2.version=rv5-stable-4 cc.version=1.80pr1-build0 extracells.cf=2500/596 extracells.version=api-1.12.2-2.5.3a25 forestry.version=5.5.0.157 hwyla.version=1.8.20-B35_1.12 ic2.version=2.8.26-ex112 -jei.version=4.7.5.87 +jei.version=4.8.5.151 mcmp.version=2.2.2_38 mekanism.version=1.12.1-9.4.1.326 tis3d.version=1.3.0.12 diff --git a/src/main/scala/li/cil/oc/client/ColorHandler.scala b/src/main/scala/li/cil/oc/client/ColorHandler.scala index 24a62597e..8430feda3 100644 --- a/src/main/scala/li/cil/oc/client/ColorHandler.scala +++ b/src/main/scala/li/cil/oc/client/ColorHandler.scala @@ -86,7 +86,7 @@ object ColorHandler { def register(handler: (ItemStack, Int) => Int, items: Item*): Unit = { Minecraft.getMinecraft.getItemColors.registerItemColorHandler(new IItemColor { - override def getColorFromItemstack(stack: ItemStack, tintIndex: Int): Int = handler(stack, tintIndex) + override def colorMultiplier(stack: ItemStack, tintIndex: Int): Int = handler(stack, tintIndex) }, items: _*) } } diff --git a/src/main/scala/li/cil/oc/common/entity/Drone.scala b/src/main/scala/li/cil/oc/common/entity/Drone.scala index 9b8bf98ca..591ecd3e4 100644 --- a/src/main/scala/li/cil/oc/common/entity/Drone.scala +++ b/src/main/scala/li/cil/oc/common/entity/Drone.scala @@ -142,7 +142,7 @@ class Drone(world: World) extends Entity(world) with MachineHost with internal.D override def isItemValidForSlot(slot: Int, stack: ItemStack): Boolean = slot >= 0 && slot < getSizeInventory - override def isUsableByPlayer(player: EntityPlayer): Boolean = player.getDistanceSqToEntity(Drone.this) < 64 + override def isUsableByPlayer(player: EntityPlayer): Boolean = player.getDistanceSq(Drone.this) < 64 } val tank = new MultiTank { override def tankCount: Int = components.components.count { diff --git a/src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala b/src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala index f347c5826..c2bf352a2 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala @@ -61,7 +61,7 @@ object DisintegrationProvider extends ScalaProvider("c4e7e3c2-8069-4fbb-b08e-74b val event = new PlayerInteractEvent.LeftClickBlock(player, pos.toBlockPos, null, null) MinecraftForge.EVENT_BUS.post(event) val allowed = !event.isCanceled && event.getUseBlock != Event.Result.DENY && event.getUseItem != Event.Result.DENY - val adventureOk = !world.getWorldInfo.getGameType.isAdventure || player.canPlayerEdit(pos.toBlockPos, null, player.getHeldItemMainhand) + val adventureOk = !world.getWorldInfo.getGameType.hasLimitedInteractions || player.canPlayerEdit(pos.toBlockPos, null, player.getHeldItemMainhand) if (allowed && adventureOk && !world.isAirBlock(pos)) { val blockState = world.getBlockState(pos.toBlockPos) val hardness = blockState.getBlock.getPlayerRelativeBlockHardness(world.getBlockState(pos.toBlockPos), player, world, pos.toBlockPos) diff --git a/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala b/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala index af321394f..d27609403 100644 --- a/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala +++ b/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala @@ -73,7 +73,7 @@ class ModPluginOpenComputers extends IModPlugin { ) subtypeRegistry.registerSubtypeInterpreter(Items.get(Constants.ItemName.Floppy).item(), new ISubtypeInterpreter { - override def getSubtypeInfo(stack: ItemStack): String = { + override def apply(stack: ItemStack): String = { if (!stack.hasTagCompound) return null val compound: NBTTagCompound = stack.getTagCompound val data = new NBTTagCompound diff --git a/src/main/scala/li/cil/oc/server/agent/Inventory.scala b/src/main/scala/li/cil/oc/server/agent/Inventory.scala index 1954556b7..fd513fc0d 100644 --- a/src/main/scala/li/cil/oc/server/agent/Inventory.scala +++ b/src/main/scala/li/cil/oc/server/agent/Inventory.scala @@ -61,7 +61,7 @@ class Inventory(playerEntity: EntityPlayer, val agent: internal.Agent) extends I override def canHarvestBlock(state: IBlockState): Boolean = state.getMaterial.isToolNotRequired || (!getCurrentItem.isEmpty && getCurrentItem.canHarvestBlock(state)) - override def getStrVsBlock(state: IBlockState): Float = if (getCurrentItem.isEmpty) 1f else getCurrentItem.getStrVsBlock(state) + override def getDestroySpeed(state: IBlockState): Float = if (getCurrentItem.isEmpty) 1f else getCurrentItem.getDestroySpeed(state) override def writeToNBT(nbt: NBTTagList): NBTTagList = nbt diff --git a/src/main/scala/li/cil/oc/server/agent/Player.scala b/src/main/scala/li/cil/oc/server/agent/Player.scala index 96e44247e..214c1df33 100644 --- a/src/main/scala/li/cil/oc/server/agent/Player.scala +++ b/src/main/scala/li/cil/oc/server/agent/Player.scala @@ -351,7 +351,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc return 0 } - if (world.getWorldInfo.getGameType.isAdventure && !canPlayerEdit(pos, side, stack)) { + if (world.getWorldInfo.getGameType.hasLimitedInteractions && !canPlayerEdit(pos, side, stack)) { return 0 } diff --git a/src/main/scala/li/cil/oc/server/component/Agent.scala b/src/main/scala/li/cil/oc/server/component/Agent.scala index bff72e30e..f939cb107 100644 --- a/src/main/scala/li/cil/oc/server/component/Agent.scala +++ b/src/main/scala/li/cil/oc/server/component/Agent.scala @@ -308,7 +308,7 @@ trait Agent extends traits.WorldControl with traits.InventoryControl with traits player.side.getFrontOffsetZ * range) val hit = world.rayTraceBlocks(origin, target) player.closestEntity(classOf[Entity]) match { - case Some(entity@(_: EntityLivingBase | _: EntityMinecart | _: entity.Drone)) if hit == null || new Vec3d(player.posX, player.posY, player.posZ).distanceTo(hit.hitVec) > player.getDistanceToEntity(entity) => new RayTraceResult(entity) + case Some(entity@(_: EntityLivingBase | _: EntityMinecart | _: entity.Drone)) if hit == null || new Vec3d(player.posX, player.posY, player.posZ).distanceTo(hit.hitVec) > player.getDistance(entity) => new RayTraceResult(entity) case _ => hit } } diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala index 90751a6f2..02d58e1f7 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala @@ -60,7 +60,7 @@ class UpgradeLeash(val host: Entity) extends AbstractManagedEnvironment with tra val bounds = nearBounds.union(farBounds) entitiesInBounds[EntityLiving](classOf[EntityLiving], bounds).find(_.canBeLeashedTo(fakePlayer)) match { case Some(entity) => - entity.setLeashedToEntity(host, true) + entity.setLeashHolder(host, true) leashedEntities += entity.getUniqueID context.pause(0.1) result(true) @@ -83,7 +83,7 @@ class UpgradeLeash(val host: Entity) extends AbstractManagedEnvironment with tra private def unleashAll() { entitiesInBounds(classOf[EntityLiving], position.bounds.grow(5, 5, 5)).foreach(entity => { - if (leashedEntities.contains(entity.getUniqueID) && entity.getLeashedToEntity == host) { + if (leashedEntities.contains(entity.getUniqueID) && entity.getLeashHolder == host) { entity.clearLeashed(true, false) } }) @@ -102,7 +102,7 @@ class UpgradeLeash(val host: Entity) extends AbstractManagedEnvironment with tra val foundEntities = mutable.Set.empty[UUID] entitiesInBounds(classOf[EntityLiving], position.bounds.grow(5, 5, 5)).foreach(entity => { if (leashedEntities.contains(entity.getUniqueID)) { - entity.setLeashedToEntity(host, true) + entity.setLeashHolder(host, true) foundEntities += entity.getUniqueID } })