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

Move nbt extensions to util subpackage

Browse Source
This commit is contained in:
DBotThePony 2025-03-30 16:27:40 +07:00
parent a2c5b84e77
commit 6f12295245
Signed by: DBot
GPG Key ID: DCC23B5715498507
39 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/MatteryBlock.kt
View File

@ -45,7 +45,7 @@ import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom
import ru.dbotthepony.mc.otm.util.math.component1
import ru.dbotthepony.mc.otm.util.math.component2
import ru.dbotthepony.mc.otm.util.math.component3
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.once
import java.util.concurrent.Callable
import java.util.function.Function

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

@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.math.weakEqualDoubles
import ru.dbotthepony.mc.otm.util.math.weakGreaterThan
import ru.dbotthepony.mc.otm.util.math.weakLessThan
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.codec.DecimalCodec
private fun isReason(status: Any?, reason: Any) = status == null || status == reason

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

@ -14,8 +14,8 @@ import ru.dbotthepony.mc.otm.capability.UpgradeType
import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
import ru.dbotthepony.mc.otm.container.UpgradeContainer
import ru.dbotthepony.mc.otm.util.immutableList
import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getCompoundList
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.countingLazy
/**

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

@ -7,8 +7,8 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup
import ru.dbotthepony.kommons.util.Listenable
import ru.dbotthepony.kommons.util.getValue
import ru.dbotthepony.kommons.util.setValue
import ru.dbotthepony.mc.otm.core.nbt.mapString
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.mapString
import ru.dbotthepony.mc.otm.util.set
import java.util.function.Consumer
interface IRedstoneControlled {

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

@ -40,8 +40,8 @@ import ru.dbotthepony.mc.otm.registry.game.MBlockEntities
import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.util.math.getSphericalBlockPositions
import ru.dbotthepony.mc.otm.util.math.times
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.map
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.otmRandom
import ru.dbotthepony.mc.otm.matter.MatterManager
import ru.dbotthepony.mc.otm.registry.MDamageTypes

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

@ -23,8 +23,8 @@ import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
import ru.dbotthepony.mc.otm.util.immutableList
import ru.dbotthepony.mc.otm.util.immutableMap
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.mapPresent
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.mapPresent
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.menu.decorative.PainterMenu
import ru.dbotthepony.mc.otm.registry.game.MBlockEntities
import java.util.*

6
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt
View File

@ -18,9 +18,9 @@ import ru.dbotthepony.mc.otm.capability.matter.PatternState
import ru.dbotthepony.mc.otm.capability.matter.ReplicationTask
import ru.dbotthepony.mc.otm.capability.matter.ReplicationTaskAllocation
import ru.dbotthepony.mc.otm.util.collect.WeakHashSet
import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getCompoundList
import ru.dbotthepony.mc.otm.util.map
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.ItemSorter
import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode
import ru.dbotthepony.mc.otm.menu.IItemSortingSettings

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

@ -34,9 +34,9 @@ import ru.dbotthepony.mc.otm.container.IEnhancedCraftingContainer
import ru.dbotthepony.mc.otm.container.util.slotIterator
import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.mapString
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.map
import ru.dbotthepony.mc.otm.util.mapString
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter
import ru.dbotthepony.mc.otm.graph.storage.StorageGraph
import ru.dbotthepony.mc.otm.graph.storage.StorageNode

7
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt
View File

@ -17,14 +17,13 @@ import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock
import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity
import ru.dbotthepony.mc.otm.capability.*
import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage
import ru.dbotthepony.mc.otm.core.*
import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart
import ru.dbotthepony.mc.otm.util.math.BlockRotation
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.math.RelativeSide
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.core.nbt.mapPresent
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.mapPresent
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.countingLazy
import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu
import ru.dbotthepony.mc.otm.registry.game.MBlockEntities

4
src/main/kotlin/ru/dbotthepony/mc/otm/capability/AbstractProfiledStorage.kt
View File

@ -6,8 +6,8 @@ import net.minecraft.nbt.CompoundTag
import net.neoforged.neoforge.common.util.INBTSerializable
import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.map
import ru.dbotthepony.mc.otm.util.set
abstract class AbstractProfiledStorage<out P>(val parent: P) : IProfiledStorage, INBTSerializable<CompoundTag?> {
final override val received = DecimalHistoryChart(ticks = HISTORY_SIZE)

7
src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt
View File

@ -2,22 +2,17 @@ package ru.dbotthepony.mc.otm.capability.drive
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import it.unimi.dsi.fastutil.objects.ObjectArraySet
import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet
import net.minecraft.core.HolderLookup
import net.minecraft.core.HolderLookup.Provider
import kotlin.jvm.JvmOverloads
import java.util.UUID
import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.ListTag
import net.minecraft.nbt.Tag
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.core.*
import ru.dbotthepony.mc.otm.util.math.BigInteger
import ru.dbotthepony.mc.otm.util.math.isPositive
import ru.dbotthepony.mc.otm.util.math.serializeNBT
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.storage.*
import java.math.BigInteger
import java.util.ArrayList

2
src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt
View File

@ -6,7 +6,7 @@ import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack
import ru.dbotthepony.mc.otm.util.math.BigInteger
import ru.dbotthepony.mc.otm.util.math.serializeNBT
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.storage.IStorageTuple
import ru.dbotthepony.mc.otm.storage.ItemStorageStack
import ru.dbotthepony.mc.otm.storage.StorageStack

4
src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt
View File

@ -15,8 +15,8 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection
import ru.dbotthepony.mc.otm.capability.extractEnergy
import ru.dbotthepony.mc.otm.capability.receiveEnergy
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.registry.StatNames
import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger

4
src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt
View File

@ -10,8 +10,8 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection
import ru.dbotthepony.mc.otm.config.EnergyBalanceValues
import ru.dbotthepony.mc.otm.config.VerboseEnergyBalanceValues
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.mapPresent
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.mapPresent
import ru.dbotthepony.mc.otm.util.set
open class BlockEnergyStorageImpl(
protected val listener: () -> Unit,

3
src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
View File

@ -5,7 +5,6 @@ import net.minecraft.core.component.DataComponents
import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.Tag
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.BlockItem
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.component.CustomData
import net.neoforged.neoforge.common.util.INBTSerializable
@ -14,7 +13,7 @@ import ru.dbotthepony.kommons.util.Delegate
import ru.dbotthepony.kommons.util.getValue
import ru.dbotthepony.kommons.util.setValue
import ru.dbotthepony.mc.otm.Registries
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import java.util.function.IntSupplier
/**

2
src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterStorageImpl.kt
View File

@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.config.EnergyBalanceValues
import ru.dbotthepony.mc.otm.config.VerboseEnergyBalanceValues
import ru.dbotthepony.mc.otm.capability.FlowDirection
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
open class MatterStorageImpl(
protected val listener: Runnable?,

4
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt
View File

@ -13,8 +13,8 @@ import ru.dbotthepony.mc.otm.compat.jade.JadeUids
import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.getCapability
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.core.nbt.putDecimal
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.putDecimal
import ru.dbotthepony.mc.otm.util.formatMatter
import snownee.jade.api.BlockAccessor
import snownee.jade.api.IBlockComponentProvider

4
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt
View File

@ -13,8 +13,8 @@ import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.mc.otm.capability.IProfiledStorage
import ru.dbotthepony.mc.otm.util.getCapability
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.core.nbt.putDecimal
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.putDecimal
import ru.dbotthepony.mc.otm.util.formatPower
import snownee.jade.api.*
import snownee.jade.api.config.IPluginConfig

4
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt
View File

@ -9,8 +9,8 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity
import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys
import ru.dbotthepony.mc.otm.compat.jade.JadeUids
import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getCompoundList
import ru.dbotthepony.mc.otm.util.set
import snownee.jade.api.BlockAccessor
import snownee.jade.api.IBlockComponentProvider
import snownee.jade.api.IServerDataProvider

2
src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt
View File

@ -14,7 +14,7 @@ import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
/**
* Flexible base implementation of [IEnhancedContainer], designed to be inherited, or used as-is

2
src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
View File

@ -9,7 +9,7 @@ import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.getOrNull
open class ContainerSlot(

6
src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/FilteredContainerSlot.kt
View File

@ -1,18 +1,14 @@
package ru.dbotthepony.mc.otm.container.slotted
import net.minecraft.core.HolderLookup
import net.minecraft.core.registries.BuiltInRegistries
import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.NbtOps
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.container.IFilteredAutomatedContainerSlot
import ru.dbotthepony.mc.otm.container.ItemFilter
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.registryName
import java.util.Collections
import ru.dbotthepony.mc.otm.util.set
open class FilteredContainerSlot(
container: SlottedContainer,

2
src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
View File

@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot
import ru.dbotthepony.mc.otm.container.ItemFilter
import ru.dbotthepony.mc.otm.container.balance
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.codec.minRange
import java.util.function.Predicate
import kotlin.reflect.KClass

2
src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt
View File

@ -16,7 +16,7 @@ import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType
import net.minecraft.world.level.storage.loot.parameters.LootContextParams
import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity
import ru.dbotthepony.mc.otm.util.fromNbt
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.stream
import ru.dbotthepony.mc.otm.registry.data.MItemFunctionTypes
import java.util.*

4
src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt
View File

@ -38,9 +38,9 @@ import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.collect.filter
import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.readDecimal
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.writeDecimal
import ru.dbotthepony.mc.otm.util.nextUUID
import ru.dbotthepony.mc.otm.util.formatPower

6
src/main/kotlin/ru/dbotthepony/mc/otm/menu/ISortingSettings.kt
View File

@ -7,9 +7,9 @@ import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.common.util.INBTSerializable
import ru.dbotthepony.kommons.util.getValue
import ru.dbotthepony.kommons.util.setValue
import ru.dbotthepony.mc.otm.core.nbt.getBoolean
import ru.dbotthepony.mc.otm.core.nbt.mapString
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getBoolean
import ru.dbotthepony.mc.otm.util.mapString
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.ItemSorter
import ru.dbotthepony.mc.otm.util.ItemStackSorter
import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback

4
src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryFoodData.kt
View File

@ -14,8 +14,8 @@ import ru.dbotthepony.mc.otm.config.IFoodRegenerationValues
import ru.dbotthepony.mc.otm.config.PlayerConfig
import ru.dbotthepony.mc.otm.util.damageType
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.getDecimal
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.registry.MDamageTypes
import kotlin.math.max
import kotlin.math.min

4
src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
View File

@ -87,8 +87,8 @@ import ru.dbotthepony.mc.otm.util.collect.filter
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.math.RGBColorDFUCodec
import ru.dbotthepony.mc.otm.util.math.minus
import ru.dbotthepony.mc.otm.core.nbt.getCompoundList
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.getCompoundList
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.Savetables
import ru.dbotthepony.mc.otm.util.TickList
import ru.dbotthepony.mc.otm.data.codec.minRange

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeature.kt
View File

@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup
import ru.dbotthepony.kommons.util.getValue
import ru.dbotthepony.kommons.util.setValue
import ru.dbotthepony.mc.otm.player.MatteryPlayer
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
abstract class AndroidFeature(val type: AndroidFeatureType<*>, val android: MatteryPlayer) : INBTSerializable<CompoundTag> {
val ply get() = android.ply

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt
View File

@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.capability.awareItemsStream
import ru.dbotthepony.mc.otm.util.TextComponent
import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.registryName
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.milliTime
import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger
import kotlin.math.absoluteValue

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidSwitchableFeature.kt
View File

@ -10,7 +10,7 @@ import ru.dbotthepony.kommons.util.setValue
import ru.dbotthepony.mc.otm.player.MatteryPlayer
import ru.dbotthepony.mc.otm.client.render.MGUIGraphics
import ru.dbotthepony.mc.otm.client.minecraft
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
abstract class AndroidSwitchableFeature(type: AndroidFeatureType<*>, android: MatteryPlayer) : AndroidFeature(type, android) {
var isActive by syncher.boolean(setter = setter@{ access, value ->

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt
View File

@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.util.isBypassArmor
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.StatNames
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.onceServer
import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger
import kotlin.math.roundToInt

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsRegenerationFeature.kt
View File

@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.player.android.AndroidFeature
import ru.dbotthepony.mc.otm.player.MatteryPlayer
import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.StatNames
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import kotlin.math.roundToInt
class NanobotsRegenerationFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) {

2
src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt
View File

@ -22,7 +22,7 @@ import net.minecraft.world.item.enchantment.ItemEnchantments
import net.minecraft.world.level.Level
import ru.dbotthepony.mc.otm.capability.MatteryCapability
import ru.dbotthepony.mc.otm.capability.matter.PatternState
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.util.registryName
import java.util.Optional
import java.util.UUID

2
src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagDelegates.kt → src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagDelegates.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.core.nbt
package ru.dbotthepony.mc.otm.util
import net.minecraft.nbt.CompoundTag
import java.util.*

4
src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagExt.kt → src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagExt.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.core.nbt
package ru.dbotthepony.mc.otm.util
import com.google.gson.JsonElement
import it.unimi.dsi.fastutil.io.FastByteArrayInputStream
@ -14,8 +14,6 @@ import net.minecraft.nbt.NumericTag
import net.minecraft.nbt.StringTag
import net.minecraft.nbt.Tag
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.readBinaryJson
import ru.dbotthepony.mc.otm.util.writeBinaryJson
import java.util.UUID
operator fun CompoundTag.set(index: String, value: Tag) = put(index, value)

1
src/main/kotlin/ru/dbotthepony/mc/otm/util/Savetables.kt
View File

@ -21,7 +21,6 @@ import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.Delegate
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.math.Vector
import ru.dbotthepony.mc.otm.core.nbt.set
import java.util.function.Supplier
import kotlin.jvm.optionals.getOrNull
import kotlin.reflect.KMutableProperty0

2
src/main/kotlin/ru/dbotthepony/mc/otm/util/TooltipList.kt
View File

@ -23,8 +23,6 @@ import ru.dbotthepony.mc.otm.client.minecraft
import ru.dbotthepony.mc.otm.config.ClientConfig
import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.core.nbt.map
import ru.dbotthepony.mc.otm.core.nbt.mapPresent
import ru.dbotthepony.mc.otm.runIfClient
class TooltipList {

2
src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/UUIDIntModifiersMap.kt
View File

@ -5,7 +5,7 @@ import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.ListTag
import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.core.nbt.contains
import ru.dbotthepony.mc.otm.util.contains
import java.util.UUID
/**