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

Get rid of savetable()

Browse Source
This commit is contained in:
DBotThePony 2023-11-17 12:29:32 +07:00
parent 6737d52c10
commit db6b5e7efc
Signed by: DBot
GPG Key ID: DCC23B5715498507
11 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
View File

@ -394,10 +394,6 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
side.revive()
}
protected inline fun <reified T : Tag, V : INBTSerializable<T?>> savetable(property: KProperty0<V>, name: String = property.name) {
savetables.stateful(property, name, T::class.java)
}
final override fun saveAdditional(nbt: CompoundTag) {
super.saveAdditional(nbt)
saveShared(nbt)

10
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
View File

@ -114,11 +114,11 @@ class MatterBottlerBlockEntity(blockPos: BlockPos, blockState: BlockState) :
savetables.bool(::isBottling)
savetables.bool(::spitItemsWhenCantWork)
savetable(::energy, ENERGY_KEY)
savetable(::matter, MATTER_STORAGE_KEY)
savetable(::bottling)
savetable(::unbottling)
savetable(::upgrades)
savetables.stateful(::energy, ENERGY_KEY)
savetables.stateful(::matter, MATTER_STORAGE_KEY)
savetables.stateful(::bottling)
savetables.stateful(::unbottling)
savetables.stateful(::upgrades)
}
var workProgress: Float = 0f

4
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt
View File

@ -60,8 +60,8 @@ class DriveRackBlockEntity(blockPos: BlockPos, blockState: BlockState) : Mattery
}.also(::addDroppableContainer)
init {
savetable(::energy, ENERGY_KEY)
savetable(::container, INVENTORY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
savetables.stateful(::container, INVENTORY_KEY)
exposeGlobally(MatteryCapability.STORAGE_NODE, cell)
savetables.int(::insertPriority)
savetables.int(::extractPriority)

4
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt
View File

@ -90,8 +90,8 @@ class DriveViewerBlockEntity(blockPos: BlockPos, blockState: BlockState) : Matte
}
init {
savetable(::energy, ENERGY_KEY)
savetable(::container, INVENTORY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
savetables.stateful(::container, INVENTORY_KEY)
}
override fun createMenu(containerID: Int, inventory: Inventory, ply: Player): AbstractContainerMenu {

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt
View File

@ -178,7 +178,7 @@ class ItemMonitorBlockEntity(blockPos: BlockPos, blockState: BlockState) : Matte
val energyConfig = ConfigurableEnergy(energy)
init {
savetable(::energy, ENERGY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
}
var poweredView: PoweredVirtualComponent<ItemStorageStack>? = null

4
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt
View File

@ -96,7 +96,7 @@ class StorageBusBlockEntity(blockPos: BlockPos, blockState: BlockState) : Matter
}
init {
savetable(::energy, ENERGY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
savetables.int(::insertPriority)
savetables.int(::extractPriority)
exposeGlobally(MatteryCapability.STORAGE_NODE, cell) { it != RelativeSide.FRONT }
@ -127,7 +127,7 @@ class StorageBusBlockEntity(blockPos: BlockPos, blockState: BlockState) : Matter
}
init {
savetable(::filter, FILTER_KEY)
savetables.stateful(::filter, FILTER_KEY)
}
override fun setLevel(level: Level) {

4
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt
View File

@ -83,7 +83,7 @@ abstract class AbstractStorageImportExport(
}
init {
savetable(::energy, ENERGY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
exposeGlobally(MatteryCapability.STORAGE_NODE, cell) { it != RelativeSide.FRONT }
}
@ -102,7 +102,7 @@ abstract class AbstractStorageImportExport(
abstract val filter: ItemFilter
init {
savetable(::filter, FILTER_KEY)
savetables.stateful(::filter, FILTER_KEY)
}
companion object {

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt
View File

@ -25,7 +25,7 @@ class StoragePowerSupplierBlockEntity(blockPos: BlockPos, blockState: BlockState
override val energy = WorkerEnergyStorage(this::markDirtyFast, MachinesConfig.STORAGE_POWER_SUPPLIER)
init {
savetable(::energy, ENERGY_KEY)
savetables.stateful(::energy, ENERGY_KEY)
exposeEnergyGlobally(energy)
exposeGlobally(MatteryCapability.STORAGE_NODE, cell)

8
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt
View File

@ -46,10 +46,10 @@ class ChemicalGeneratorBlockEntity(pos: BlockPos, state: BlockState) : MatteryDe
for (piece in energyConfig.pieces.values)
piece.automatePush = true
savetable(::energy, ENERGY_KEY)
savetable(::batteryContainer)
savetable(::residueContainer)
savetable(::fuelContainer)
savetables.stateful(::energy, ENERGY_KEY)
savetables.stateful(::batteryContainer)
savetables.stateful(::residueContainer)
savetables.stateful(::fuelContainer)
savetables.int(::workTicks)
savetables.int(::workTicksTotal)

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/CobblerBlockEntity.kt
View File

@ -26,7 +26,7 @@ class CobblerBlockEntity(blockPos: BlockPos, blockState: BlockState)
val itemConfig = ConfigurableItemHandler(output = container.handler(HandlerFilter.OnlyOut))
init {
savetable(::container, INVENTORY_KEY)
savetables.stateful(::container, INVENTORY_KEY)
}
override fun onJobFinish(status: JobStatus<ItemJob>, id: Int) {

6
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt
View File

@ -79,9 +79,9 @@ class PlatePressBlockEntity(
)
init {
savetable(::energy, ENERGY_KEY)
savetable(::inputContainer)
savetable(::outputContainer)
savetables.stateful(::energy, ENERGY_KEY)
savetables.stateful(::inputContainer)
savetables.stateful(::outputContainer)
savetables.double(::experience)
savetables.stateful(::upgrades)
}