From 9cd09a0f468353956c144f43627f52a189bae799 Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 11 Oct 2017 22:13:43 -0700 Subject: [PATCH] rename expand to grow, changes in mcp closes #2498 --- .gitignore | 4 ++++ build.properties | 2 +- .../scala/li/cil/oc/client/renderer/HighlightRenderer.scala | 2 +- .../scala/li/cil/oc/client/renderer/MFUTargetRenderer.scala | 2 +- .../cil/oc/common/nanomachines/provider/MagnetProvider.scala | 2 +- src/main/scala/li/cil/oc/common/tileentity/Charger.scala | 2 +- src/main/scala/li/cil/oc/common/tileentity/Robot.scala | 2 +- src/main/scala/li/cil/oc/server/agent/Player.scala | 2 +- src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala | 4 ++-- .../scala/li/cil/oc/server/component/UpgradeTractorBeam.scala | 2 +- .../scala/li/cil/oc/server/component/UpgradeTrading.scala | 2 +- src/main/scala/li/cil/oc/server/network/Waypoints.scala | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 977fed16c..f28042415 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ # OS X .DS_Store /run + +# VS Code +/.vscode + diff --git a/build.properties b/build.properties index 2cc9e8500..9ab12e41f 100644 --- a/build.properties +++ b/build.properties @@ -11,6 +11,6 @@ hwyla.version=1.8.20-B35_1.12 ic2.version=2.8.26-ex112 jei.version=4.7.5.87 mcmp.version=2.2.2_38 -tis3d.version=1.2.2.4 +tis3d.version=1.3.0.12 maven.url=file:///home/www/maven.cil.li/web diff --git a/src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala index d2d08a67f..0dc62e346 100644 --- a/src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala @@ -124,7 +124,7 @@ object HighlightRenderer { for (shape <- print.shapes) { val bounds = shape.bounds.rotateTowards(print.facing) - RenderGlobal.drawSelectionBoundingBox(bounds.expand(expansion, expansion, expansion) + RenderGlobal.drawSelectionBoundingBox(bounds.grow(expansion, expansion, expansion) .offset(blockPos.x, blockPos.y, blockPos.z) .offset(-pos.x, -pos.y, -pos.z), 0, 0, 0, 0x66/0xFFf.toFloat) } diff --git a/src/main/scala/li/cil/oc/client/renderer/MFUTargetRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/MFUTargetRenderer.scala index 9c8c6389d..91850577b 100644 --- a/src/main/scala/li/cil/oc/client/renderer/MFUTargetRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/MFUTargetRenderer.scala @@ -29,7 +29,7 @@ object MFUTargetRenderer { if (player.getEntityWorld.provider.getDimension != dimension) return if (player.getDistance(x, y, z) > 64) return - val bounds = BlockPosition(x, y, z).bounds.expand(0.1, 0.1, 0.1) + val bounds = BlockPosition(x, y, z).bounds.grow(0.1, 0.1, 0.1) val px = player.lastTickPosX + (player.posX - player.lastTickPosX) * e.getPartialTicks val py = player.lastTickPosY + (player.posY - player.lastTickPosY) * e.getPartialTicks diff --git a/src/main/scala/li/cil/oc/common/nanomachines/provider/MagnetProvider.scala b/src/main/scala/li/cil/oc/common/nanomachines/provider/MagnetProvider.scala index afe850b94..49a0f966d 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/provider/MagnetProvider.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/provider/MagnetProvider.scala @@ -22,7 +22,7 @@ object MagnetProvider extends ScalaProvider("9324d5ec-71f1-41c2-b51c-406e527668f val world = player.getEntityWorld if (!world.isRemote) { val actualRange = Settings.get.nanomachineMagnetRange * api.Nanomachines.getController(player).getInputCount(this) - val items = world.getEntitiesWithinAABB(classOf[EntityItem], player.getEntityBoundingBox.expand(actualRange, actualRange, actualRange)) + val items = world.getEntitiesWithinAABB(classOf[EntityItem], player.getEntityBoundingBox.grow(actualRange, actualRange, actualRange)) items.collect { case item: EntityItem if !item.cannotPickup && !item.getItem.isEmpty && player.inventory.mainInventory.exists(stack => stack.isEmpty || stack.getCount < stack.getMaxStackSize && stack.isItemEqual(item.getItem)) => val dx = player.posX - item.posX diff --git a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala index 6c3ed2403..e2f15987a 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Charger.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Charger.scala @@ -228,7 +228,7 @@ class Charger extends traits.Environment with traits.PowerAcceptor with traits.R }).collect { case Some(t: RobotProxy) => new RobotChargeable(t.robot) } - val bounds = BlockPosition(this).bounds.expand(1, 1, 1) + val bounds = BlockPosition(this).bounds.grow(1, 1, 1) val drones = getWorld.getEntitiesWithinAABB(classOf[Drone], bounds).collect { case drone: Drone => new DroneChargeable(drone) } diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala index d1d5292e7..b482a61a7 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala @@ -330,7 +330,7 @@ class Robot extends traits.Computer with traits.PowerInformation with traits.Rot override def getRenderBoundingBox: AxisAlignedBB = if (getBlockType != null && getWorld != null) - getBlockType.getCollisionBoundingBox(getWorld.getBlockState(getPos), getWorld, getPos).expand(0.5, 0.5, 0.5).offset(getPos) + getBlockType.getCollisionBoundingBox(getWorld.getBlockState(getPos), getWorld, getPos).grow(0.5, 0.5, 0.5).offset(getPos) else new AxisAlignedBB(0, 0, 0, 1, 1, 1).offset(getPos) 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 b52465460..96e44247e 100644 --- a/src/main/scala/li/cil/oc/server/agent/Player.scala +++ b/src/main/scala/li/cil/oc/server/agent/Player.scala @@ -132,7 +132,7 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc } private def adjacentItems = { - world.getEntitiesWithinAABB(classOf[EntityItem], BlockPosition(agent).bounds.expand(2, 2, 2)) + world.getEntitiesWithinAABB(classOf[EntityItem], BlockPosition(agent).bounds.grow(2, 2, 2)) } private def collectDroppedItems(itemsBefore: Iterable[EntityItem]) { 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 a2f3bae86..90751a6f2 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala @@ -82,7 +82,7 @@ class UpgradeLeash(val host: Entity) extends AbstractManagedEnvironment with tra } private def unleashAll() { - entitiesInBounds(classOf[EntityLiving], position.bounds.expand(5, 5, 5)).foreach(entity => { + entitiesInBounds(classOf[EntityLiving], position.bounds.grow(5, 5, 5)).foreach(entity => { if (leashedEntities.contains(entity.getUniqueID) && entity.getLeashedToEntity == host) { entity.clearLeashed(true, false) } @@ -100,7 +100,7 @@ class UpgradeLeash(val host: Entity) extends AbstractManagedEnvironment with tra // entities only remember their leashee if it's an EntityLivingBase... EventHandler.scheduleServer(() => { val foundEntities = mutable.Set.empty[UUID] - entitiesInBounds(classOf[EntityLiving], position.bounds.expand(5, 5, 5)).foreach(entity => { + entitiesInBounds(classOf[EntityLiving], position.bounds.grow(5, 5, 5)).foreach(entity => { if (leashedEntities.contains(entity.getUniqueID)) { entity.setLeashedToEntity(host, true) foundEntities += entity.getUniqueID diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala index 91a765771..18cb4bed5 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala @@ -51,7 +51,7 @@ object UpgradeTractorBeam { @Callback(doc = """function():boolean -- Tries to pick up a random item in the robots' vicinity.""") def suck(context: Context, args: Arguments): Array[AnyRef] = { - val items = world.getEntitiesWithinAABB(classOf[EntityItem], position.bounds.expand(pickupRadius, pickupRadius, pickupRadius)) + val items = world.getEntitiesWithinAABB(classOf[EntityItem], position.bounds.grow(pickupRadius, pickupRadius, pickupRadius)) .filter(item => item.isEntityAlive && !item.cannotPickup) if (items.nonEmpty) { val item = items(world.rand.nextInt(items.size)) diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala b/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala index 646cd25a7..400ae90d5 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala @@ -45,7 +45,7 @@ class UpgradeTrading(val host: EnvironmentHost) extends AbstractManagedEnvironme @Callback(doc = "function():table -- Returns a table of trades in range as userdata objects.") def getTrades(context: Context, args: Arguments): Array[AnyRef] = { - result(entitiesInBounds[Entity](classOf[Entity], position.bounds.expand(maxRange, maxRange, maxRange)). + result(entitiesInBounds[Entity](classOf[Entity], position.bounds.grow(maxRange, maxRange, maxRange)). filter(isInRange). collect { case merchant: IMerchant => merchant }. flatMap(merchant => merchant.getRecipes(null).indices.map(new Trade(this, merchant, _)))) diff --git a/src/main/scala/li/cil/oc/server/network/Waypoints.scala b/src/main/scala/li/cil/oc/server/network/Waypoints.scala index cbab597d8..5ee18be67 100644 --- a/src/main/scala/li/cil/oc/server/network/Waypoints.scala +++ b/src/main/scala/li/cil/oc/server/network/Waypoints.scala @@ -51,7 +51,7 @@ object Waypoints { def findWaypoints(pos: BlockPosition, range: Double): Iterable[Waypoint] = { dimensions.get(pos.world.get.provider.getDimension) match { case Some(set) => - val bounds = pos.bounds.expand(range * 0.5, range * 0.5, range * 0.5) + val bounds = pos.bounds.grow(range * 0.5, range * 0.5, range * 0.5) set.query((bounds.minX, bounds.minY, bounds.minZ), (bounds.maxX, bounds.maxY, bounds.maxZ)) case _ => Iterable.empty }