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

Prioritize IMatteryEnergyStorage over anything else

Browse Source
This commit is contained in:
DBotThePony 2022-09-09 22:50:01 +07:00
parent d8e9909ca1
commit 4371ca4f26
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,12 +106,18 @@ val ICapabilityProvider.matteryEnergy: IMatteryEnergyStorage? get() {
/** /**
* Shortcut for getting [LazyOptional] with [IEnergyStorage], including wrappers for it * Shortcut for getting [LazyOptional] with [IEnergyStorage], including wrappers for it
*/ */
fun ICapabilityProvider.getEnergySided(side: Direction? = null): LazyOptional<IEnergyStorage> { fun ICapabilityProvider.getEnergySided(side: Direction? = null): LazyOptional<out IEnergyStorage> {
val mattery = getCapability(MatteryCapability.ENERGY, side)
if (mattery.isPresent) {
return mattery
}
if (isMekanismLoaded) { if (isMekanismLoaded) {
val mekanismEnergy = getMekanismEnergySided(side) val mekanismEnergy = getMekanismEnergySided(side)
if (mekanismEnergy.isPresent) { if (mekanismEnergy.isPresent) {
return mekanismEnergy.cast() return mekanismEnergy
} }
} }
@ -121,7 +127,13 @@ fun ICapabilityProvider.getEnergySided(side: Direction? = null): LazyOptional<IE
/** /**
* Shortcut for getting [LazyOptional] with [IMatteryEnergyStorage], including wrappers for it * Shortcut for getting [LazyOptional] with [IMatteryEnergyStorage], including wrappers for it
*/ */
fun ICapabilityProvider.getMatteryEnergySided(side: Direction? = null): LazyOptional<IMatteryEnergyStorage> { fun ICapabilityProvider.getMatteryEnergySided(side: Direction? = null): LazyOptional<out IMatteryEnergyStorage> {
val mattery = getCapability(MatteryCapability.ENERGY, side)
if (mattery.isPresent) {
return mattery
}
if (isMekanismLoaded) { if (isMekanismLoaded) {
val mekanismEnergy = getMekanismEnergySided(side) val mekanismEnergy = getMekanismEnergySided(side)
@ -130,7 +142,7 @@ fun ICapabilityProvider.getMatteryEnergySided(side: Direction? = null): LazyOpti
} }
} }
return getCapability(MatteryCapability.ENERGY, side) return LazyOptional.empty()
} }
fun Player.extendedItemIterator(): MutableIterator<ItemStack> { fun Player.extendedItemIterator(): MutableIterator<ItemStack> {