DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
GearShocky 2023-03-25 23:39:27 +06:00
commit c81f181c46
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt
View File

@ -209,7 +209,7 @@ fun ICapabilityProvider.getMatteryEnergySided(side: Direction? = null): LazyOpti
* Contains all items that player might carry * Contains all items that player might carry
*/ */
fun Player.itemsStream(includeCosmetics: Boolean = true): Stream<out ItemStack> { fun Player.itemsStream(includeCosmetics: Boolean = true): Stream<out ItemStack> {
val streams = LinkedList<Stream<out ItemStack>>() val streams = ArrayList<Stream<out ItemStack>>()
streams.add(inventory.stream()) streams.add(inventory.stream())
matteryPlayer?.let { matteryPlayer?.let {
@ -226,7 +226,7 @@ fun Player.itemsStream(includeCosmetics: Boolean = true): Stream<out ItemStack>
streams.add(cosmeticArmorStream()) streams.add(cosmeticArmorStream())
} }
return Streams.concat(*streams.toTypedArray()) return streams.stream().flatMap { it }
} }
/** /**
@ -256,7 +256,7 @@ fun Player.allItemsStream(includeCosmetics: Boolean = true): Stream<out ItemStac
* Contains all items that player might carry * Contains all items that player might carry
*/ */
fun Player.awareItemsStream(includeCosmetics: Boolean = false): Stream<out AwareItemStack> { fun Player.awareItemsStream(includeCosmetics: Boolean = false): Stream<out AwareItemStack> {
val streams = LinkedList<Stream<out AwareItemStack>>() val streams = ArrayList<Stream<out AwareItemStack>>()
streams.add(inventory.awareStream()) streams.add(inventory.awareStream())
matteryPlayer?.let { matteryPlayer?.let {
@ -273,7 +273,7 @@ fun Player.awareItemsStream(includeCosmetics: Boolean = false): Stream<out Aware
streams.add(cosmeticArmorAwareStream()) streams.add(cosmeticArmorAwareStream())
} }
return Streams.concat(*streams.toTypedArray()) return streams.stream().flatMap { it }
} }
/** /**

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterReconstructorScreen.kt
View File

@ -29,7 +29,7 @@ class MatterReconstructorScreen(menu: MatterReconstructorMenu, inventory: Invent
ProgressGaugePanel(this, frame, menu.progress, 37f, PROGRESS_ARROW_TOP) ProgressGaugePanel(this, frame, menu.progress, 37f, PROGRESS_ARROW_TOP)
makeDeviceControls(this, frame, redstoneConfig = menu.redstoneConfig, itemConfig = menu.itemConfig, energyConfig = menu.energyConfig) makeDeviceControls(this, frame, redstoneConfig = menu.redstoneConfig, itemConfig = menu.itemConfig, energyConfig = menu.energyConfig)
makeCuriosPanel(this, frame, menu.equipment.curiosSlots) makeCuriosPanel(this, frame, menu.equipment.curiosSlots, autoAlign = true)
PlayerEquipmentPanel(this, frame, armorSlots = menu.equipment.armorSlots).also { PlayerEquipmentPanel(this, frame, armorSlots = menu.equipment.armorSlots).also {
it.leftSided = false it.leftSided = false

2
src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
View File

@ -87,7 +87,7 @@ private fun Player.curiosStreamImpl(includeCosmetics: Boolean): Stream<out ItemS
} }
} }
return Streams.concat(*result.toTypedArray()) return result.stream().flatMap { it }
} }
fun Player.curiosStream(includeCosmetics: Boolean = true): Stream<out ItemStack> { fun Player.curiosStream(includeCosmetics: Boolean = true): Stream<out ItemStack> {