AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up new trade code slightly

Browse Source
This commit is contained in:
payonel 2018-10-01 02:47:55 -07:00
parent 4e24b36cd4
commit cf5e23e1f1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/li/cil/oc/server/component/UpgradeTrading.scala
View File

@ -48,11 +48,7 @@ class UpgradeTrading(val host: EnvironmentHost) extends prefab.ManagedEnvironmen
val merchants = entitiesInBounds[Entity](position.bounds.expand(maxRange, maxRange, maxRange)).
filter(isInRange).
collect { case merchant: IMerchant => merchant }
var ids: List[UUID] = List[UUID]()
for ( (id, _) <- merchants.groupBy { merchant => merchant.getPersistentID } ) {
ids :+= id
}
ids = ids.sorted.reverse
val ids = merchants.collect { case merchant: IMerchant => merchant.getPersistentID }.sorted.reverse
def indexOfMerchant(id: UUID): Int = {
for (i <- ids.indices) {
if (ids(i) == id) {
@ -61,7 +57,8 @@ class UpgradeTrading(val host: EnvironmentHost) extends prefab.ManagedEnvironmen
}
-1
}
result(merchants.flatMap(merchant => merchant.getRecipes(null).indices.map(index => {
// sorting the result is not necessary, but will help the trade sort index line up nicely
result(merchants.sortBy(m => m.getPersistentID).reverse.flatMap(merchant => merchant.getRecipes(null).indices.map(index => {
val idx = indexOfMerchant(merchant.getPersistentID)
new Trade(this, merchant, index, idx)
})))