refactor: Use custom ray trace provider
This commit is contained in:
@@ -11,11 +11,14 @@ import net.minecraft.block.Block
|
||||
import net.minecraft.item.BlockItem
|
||||
import net.minecraft.item.ItemStack
|
||||
import net.minecraft.nbt.NbtCompound
|
||||
import net.minecraft.text.Text
|
||||
import moe.nea.firmament.repo.ReforgeStore.kJson
|
||||
import moe.nea.firmament.util.MC
|
||||
import moe.nea.firmament.util.SBData
|
||||
import moe.nea.firmament.util.SkyBlockIsland
|
||||
import moe.nea.firmament.util.SkyblockId
|
||||
import moe.nea.firmament.util.mc.FirmamentDataComponentTypes
|
||||
import moe.nea.firmament.util.mc.displayNameAccordingToNbt
|
||||
|
||||
class MiningRepoData : IReloadable {
|
||||
var customMiningAreas: Map<SkyBlockIsland, CustomMiningArea> = mapOf()
|
||||
@@ -41,7 +44,23 @@ class MiningRepoData : IReloadable {
|
||||
val name: String? = null,
|
||||
val baseDrop: SkyblockId? = null,
|
||||
val blocks189: List<Block189> = emptyList()
|
||||
)
|
||||
) {
|
||||
@Transient
|
||||
val dropItem = baseDrop?.let(::SBItemStack)
|
||||
private val labeledStack by lazy {
|
||||
dropItem?.asCopiedItemStack()?.also(::markItemStack)
|
||||
}
|
||||
|
||||
private fun markItemStack(itemStack: ItemStack) {
|
||||
itemStack.set(FirmamentDataComponentTypes.CUSTOM_MINING_BLOCK_DATA, this)
|
||||
if (name != null)
|
||||
itemStack.displayNameAccordingToNbt = Text.literal(name)
|
||||
}
|
||||
|
||||
fun getDisplayItem(block: Block): ItemStack {
|
||||
return labeledStack ?: ItemStack(block).also(::markItemStack)
|
||||
}
|
||||
}
|
||||
|
||||
@Serializable
|
||||
data class Block189(
|
||||
@@ -54,6 +73,7 @@ class MiningRepoData : IReloadable {
|
||||
|
||||
val isCurrentlyActive: Boolean
|
||||
get() = isActiveIn(SBData.skyblockLocation ?: SkyBlockIsland.NIL)
|
||||
|
||||
fun isActiveIn(location: SkyBlockIsland) = onlyIn == null || location in onlyIn
|
||||
|
||||
private fun convertToModernBlock(): Block? {
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
package moe.nea.firmament.util.mc
|
||||
|
||||
import com.mojang.serialization.Codec
|
||||
import io.netty.buffer.ByteBuf
|
||||
import net.minecraft.component.ComponentType
|
||||
import net.minecraft.network.codec.PacketCodec
|
||||
import net.minecraft.registry.Registries
|
||||
import net.minecraft.registry.Registry
|
||||
import moe.nea.firmament.Firmament
|
||||
import moe.nea.firmament.annotations.Subscribe
|
||||
import moe.nea.firmament.events.ClientInitEvent
|
||||
import moe.nea.firmament.repo.MiningRepoData
|
||||
|
||||
object FirmamentDataComponentTypes {
|
||||
|
||||
@@ -26,11 +29,32 @@ object FirmamentDataComponentTypes {
|
||||
)
|
||||
}
|
||||
|
||||
fun <T> errorCodec(message: String): PacketCodec<in ByteBuf, T> =
|
||||
object : PacketCodec<ByteBuf, T> {
|
||||
override fun decode(buf: ByteBuf?): T? {
|
||||
error(message)
|
||||
}
|
||||
|
||||
override fun encode(buf: ByteBuf?, value: T?) {
|
||||
error(message)
|
||||
}
|
||||
}
|
||||
|
||||
fun <T, B : ComponentType.Builder<T>> B.neverEncode(message: String = "This element should never be encoded or decoded"): B {
|
||||
packetCodec(errorCodec(message))
|
||||
codec(null)
|
||||
return this
|
||||
}
|
||||
|
||||
val IS_BROKEN = register<Boolean>(
|
||||
"is_broken"
|
||||
) {
|
||||
it.codec(Codec.BOOL.fieldOf("is_broken").codec())
|
||||
}
|
||||
|
||||
val CUSTOM_MINING_BLOCK_DATA = register<MiningRepoData.CustomMiningBlock>("custom_mining_block") {
|
||||
it.neverEncode()
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user