got rid of some warnings
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
package org.neoflock.neocomputers.block
|
package org.neoflock.neocomputers.block
|
||||||
|
|
||||||
import net.minecraft.client.player.LocalPlayer
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.core.Direction
|
import net.minecraft.core.Direction
|
||||||
import net.minecraft.core.HolderLookup
|
import net.minecraft.core.HolderLookup
|
||||||
@@ -8,7 +7,6 @@ import net.minecraft.nbt.CompoundTag
|
|||||||
import net.minecraft.network.FriendlyByteBuf
|
import net.minecraft.network.FriendlyByteBuf
|
||||||
import net.minecraft.network.chat.OutgoingChatMessage
|
import net.minecraft.network.chat.OutgoingChatMessage
|
||||||
import net.minecraft.network.chat.PlayerChatMessage
|
import net.minecraft.network.chat.PlayerChatMessage
|
||||||
import net.minecraft.server.level.ServerPlayer
|
|
||||||
import net.minecraft.world.InteractionResult
|
import net.minecraft.world.InteractionResult
|
||||||
import net.minecraft.world.entity.player.Player
|
import net.minecraft.world.entity.player.Player
|
||||||
import net.minecraft.world.level.Level
|
import net.minecraft.world.level.Level
|
||||||
@@ -18,7 +16,6 @@ import net.minecraft.world.level.block.state.BlockState
|
|||||||
import net.minecraft.world.phys.BlockHitResult
|
import net.minecraft.world.phys.BlockHitResult
|
||||||
import org.neoflock.neocomputers.entity.BlockEntities
|
import org.neoflock.neocomputers.entity.BlockEntities
|
||||||
import org.neoflock.neocomputers.network.DeviceNode
|
import org.neoflock.neocomputers.network.DeviceNode
|
||||||
import org.neoflock.neocomputers.network.Networking
|
|
||||||
import org.neoflock.neocomputers.network.PowerRole
|
import org.neoflock.neocomputers.network.PowerRole
|
||||||
import kotlin.math.min
|
import kotlin.math.min
|
||||||
|
|
||||||
@@ -43,9 +40,9 @@ open class CapacitorEntity(val capacity: Long, type: BlockEntityType<*>, pos: Bl
|
|||||||
override fun getDeviceNodes() = listOf(deviceNode)
|
override fun getDeviceNodes() = listOf(deviceNode)
|
||||||
override fun getNodeFromSide(directionToRequester: Direction) = deviceNode
|
override fun getNodeFromSide(directionToRequester: Direction) = deviceNode
|
||||||
|
|
||||||
override fun loadAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
|
override fun loadAdditional(tag: CompoundTag, registries: HolderLookup.Provider) {
|
||||||
super.loadAdditional(compoundTag, provider)
|
super.loadAdditional(tag, registries)
|
||||||
deviceNode.energy = min(compoundTag.getLong("energy"), deviceNode.energyCapacity)
|
deviceNode.energy = min(tag.getLong("energy"), deviceNode.energyCapacity)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
|
override fun saveAdditional(compoundTag: CompoundTag, provider: HolderLookup.Provider) {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.neoflock.neocomputers.entity;
|
package org.neoflock.neocomputers.entity
|
||||||
|
|
||||||
import net.minecraft.core.BlockPos
|
import net.minecraft.core.BlockPos
|
||||||
import net.minecraft.locale.Language
|
import net.minecraft.locale.Language
|
||||||
@@ -59,7 +59,7 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
|
|||||||
|
|
||||||
override fun processCommit(buf: FriendlyByteBuf) {
|
override fun processCommit(buf: FriendlyByteBuf) {
|
||||||
super.processCommit(buf)
|
super.processCommit(buf)
|
||||||
if(Networking.changeNodeAddress(this, buf.readUUID())) createscreenstuffs()
|
if(Networking.changeNodeAddress(this, buf.readUUID())) createScreenTexture()
|
||||||
isOn = buf.readBoolean()
|
isOn = buf.readBoolean()
|
||||||
lastError = buf.readUtf().ifEmpty { null }
|
lastError = buf.readUtf().ifEmpty { null }
|
||||||
textBuf.decodeContents(buf)
|
textBuf.decodeContents(buf)
|
||||||
@@ -69,30 +69,30 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
|
|||||||
|
|
||||||
val textBuf = TextBuffer(50, 16)
|
val textBuf = TextBuffer(50, 16)
|
||||||
|
|
||||||
private var cleanrenderer: () -> Unit = { }; // TODO: THIS SUCKS, FIND A BETTER WAY
|
private var cleanRenderer: () -> Unit = { } // TODO: THIS SUCKS, FIND A BETTER WAY
|
||||||
|
|
||||||
override fun tickDevice(level: Level) {
|
override fun tickDevice(level: Level) {
|
||||||
super.tickDevice(level)
|
super.tickDevice(level)
|
||||||
cleanrenderer()
|
cleanRenderer()
|
||||||
createscreenstuffs()
|
createScreenTexture()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setRemoved() {
|
override fun setRemoved() {
|
||||||
super.setRemoved()
|
super.setRemoved()
|
||||||
bound = "screen/unbound" // ensure no missing texture is displayed
|
bound = "screen/unbound" // ensure no missing texture is displayed
|
||||||
cleanrenderer()
|
cleanRenderer()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun createscreenstuffs() {
|
private fun createScreenTexture() {
|
||||||
bound = "screen/"+deviceNode.address.toString().replace("-", "_")
|
bound = "screen/"+deviceNode.address.toString().replace("-", "_")
|
||||||
if (level!!.isClientSide) {
|
if (level!!.isClientSide) {
|
||||||
if(lastError == null) {
|
if(lastError == null) {
|
||||||
if(!isOn) {
|
if(!isOn) {
|
||||||
textBuf.fill(0, 0, textBuf.width, textBuf.height)
|
textBuf.fill(0, 0, textBuf.width, textBuf.height)
|
||||||
}
|
}
|
||||||
var renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), textBuf)
|
val renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), textBuf)
|
||||||
renderer.drawBuffer()
|
renderer.drawBuffer()
|
||||||
cleanrenderer = { renderer.clean() }
|
cleanRenderer = { renderer.clean() }
|
||||||
} else {
|
} else {
|
||||||
var trueError = lastError!!
|
var trueError = lastError!!
|
||||||
if(trueError.startsWith("@")) {
|
if(trueError.startsWith("@")) {
|
||||||
@@ -105,9 +105,9 @@ class ScreenEntity(blockPos: BlockPos, blockState: BlockState) :
|
|||||||
val bg = 0x2B68A6
|
val bg = 0x2B68A6
|
||||||
throwAwayBuf.fill(0, 0, throwAwayBuf.width, throwAwayBuf.height, GPUChar(' ', fg, bg))
|
throwAwayBuf.fill(0, 0, throwAwayBuf.width, throwAwayBuf.height, GPUChar(' ', fg, bg))
|
||||||
throwAwayBuf.set((throwAwayBuf.width - trueError.length) / 2, throwAwayBuf.height/2, trueError, fg, bg)
|
throwAwayBuf.set((throwAwayBuf.width - trueError.length) / 2, throwAwayBuf.height/2, trueError, fg, bg)
|
||||||
var renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), throwAwayBuf)
|
val renderer = BufferRenderer(ResourceLocation.fromNamespaceAndPath(NeoComputers.MODID, bound), throwAwayBuf)
|
||||||
renderer.drawBuffer()
|
renderer.drawBuffer()
|
||||||
cleanrenderer = { renderer.clean() }
|
cleanRenderer = { renderer.clean() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user