AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 09:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: improvements, fixes

Browse Source
This commit is contained in:
Bixilon 2021-10-29 12:19:09 +02:00
parent b568fa7f07
commit 641d77f4fb
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
8 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
View File

@ -274,7 +274,6 @@ class RenderWindow(
Log.log(LogMessageType.RENDERING_LOADING) { "Starting loop" } Log.log(LogMessageType.RENDERING_LOADING) { "Starting loop" }
var closed = false var closed = false
connection.registerEvent(CallbackEventInvoker.of<WindowCloseEvent> { closed = true }) connection.registerEvent(CallbackEventInvoker.of<WindowCloseEvent> { closed = true })
while (true) { while (true) {
if (connection.wasConnected || closed) { if (connection.wasConnected || closed) {
break break

8
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarHealthElement.kt
View File

@ -274,9 +274,9 @@ class HotbarHealthElement(hudRenderer: HUDRenderer) : AbstractHotbarHealthElemen
} }
companion object { companion object {
val POISON_TEXT_COLOR = "#602020".asColor() private val POISON_TEXT_COLOR = "#602020".asColor()
val WITHER_TEXT_COLOR = "#2b2b2b".asColor() private val WITHER_TEXT_COLOR = "#2b2b2b".asColor()
val FROZEN_TEXT_COLOR = "#a8f7ff".asColor() private val FROZEN_TEXT_COLOR = "#a8f7ff".asColor()
val ABSORPTION_TEXT_COLOR = "#d4af37".asColor() private val ABSORPTION_TEXT_COLOR = "#d4af37".asColor()
} }
} }

5
src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/hotbar/HotbarVehicleHealthElement.kt
View File

@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud.elements.hotbar
import de.bixilon.minosoft.data.entities.entities.LivingEntity import de.bixilon.minosoft.data.entities.entities.LivingEntity
import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames import de.bixilon.minosoft.data.registries.effects.attributes.DefaultStatusEffectAttributeNames
import de.bixilon.minosoft.data.text.ChatComponent import de.bixilon.minosoft.data.text.ChatComponent
import de.bixilon.minosoft.data.text.RGBColor.Companion.asColor
import de.bixilon.minosoft.data.text.TextComponent import de.bixilon.minosoft.data.text.TextComponent
import de.bixilon.minosoft.gui.rendering.gui.elements.Pollable import de.bixilon.minosoft.gui.rendering.gui.elements.Pollable
import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.ImageElement import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.ImageElement
@ -101,4 +102,8 @@ class HotbarVehicleHealthElement(hudRenderer: HUDRenderer) : AbstractHotbarHealt
override fun tick() { override fun tick() {
apply() apply()
} }
companion object {
private val NORMAL_TEXT_COLOR = "#da662c".asColor()
}
} }

1
src/main/java/de/bixilon/minosoft/gui/rendering/util/JavaBackport.java
View File

@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@Deprecated
public class JavaBackport { public class JavaBackport {
/** /**
* The maximum size of array to allocate. * The maximum size of array to allocate.

6
src/main/java/de/bixilon/minosoft/gui/rendering/util/ScreenshotTaker.kt
View File

@ -23,6 +23,8 @@ import de.bixilon.minosoft.gui.rendering.system.base.PixelTypes
import de.bixilon.minosoft.terminal.RunConfiguration import de.bixilon.minosoft.terminal.RunConfiguration
import de.bixilon.minosoft.util.Util import de.bixilon.minosoft.util.Util
import de.bixilon.minosoft.util.task.pool.DefaultThreadPool import de.bixilon.minosoft.util.task.pool.DefaultThreadPool
import de.bixilon.minosoft.util.task.pool.ThreadPool
import de.bixilon.minosoft.util.task.pool.ThreadPoolRunnable
import glm_.vec2.Vec2i import glm_.vec2.Vec2i
import java.awt.image.BufferedImage import java.awt.image.BufferedImage
import java.io.File import java.io.File
@ -49,7 +51,7 @@ class ScreenshotTaker(
} }
} }
DefaultThreadPool += { DefaultThreadPool += ThreadPoolRunnable(priority = ThreadPool.HIGHER) {
try { try {
val bufferedImage = BufferedImage(width, height, BufferedImage.TYPE_INT_RGB) val bufferedImage = BufferedImage(width, height, BufferedImage.TYPE_INT_RGB)
@ -97,7 +99,7 @@ class ScreenshotTaker(
private fun Throwable?.fail() { private fun Throwable?.fail() {
this?.printStackTrace() this?.printStackTrace()
renderWindow.sendDebugMessage("§cFailed to make a screenshot!") renderWindow.sendDebugMessage("§cFailed to make a screenshot: ${this?.message}")
} }
companion object { companion object {

2
src/main/java/de/bixilon/minosoft/protocol/protocol/InByteBuffer.kt
View File

@ -99,7 +99,7 @@ open class InByteBuffer {
} }
fun readVelocity(): Vec3d { fun readVelocity(): Vec3d {
return Vec3d(readShort(), readShort(), readShort()) / ProtocolDefinition.VELOCITY_CONSTANT return Vec3d(readShort(), readShort(), readShort()) / ProtocolDefinition.VELOCITY_NETWORK_DIVIDER
} }
fun readInt(): Int { fun readInt(): Int {

2
src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java
View File

@ -90,7 +90,7 @@ public final class ProtocolDefinition {
public static final float TICK_TIMEf = (float) TICK_TIME; public static final float TICK_TIMEf = (float) TICK_TIME;
public static final double TICK_TIMEd = TICK_TIME; public static final double TICK_TIMEd = TICK_TIME;
public static final float VELOCITY_CONSTANT = 8000.0f; public static final float VELOCITY_NETWORK_DIVIDER = 8000.0f;
public static final float GRAVITY = 32; public static final float GRAVITY = 32;
public static final boolean FAST_MOVEMENT = true; public static final boolean FAST_MOVEMENT = true;

6
src/main/java/de/bixilon/minosoft/util/task/pool/ThreadPool.kt
View File

@ -193,10 +193,12 @@ open class ThreadPool(
} }
companion object Priorities { companion object Priorities {
const val HIGHEST = 500 const val HIGHEST = Int.MAX_VALUE
const val HIGHER = 500
const val HIGH = 100 const val HIGH = 100
const val NORMAL = 0 const val NORMAL = 0
const val LOW = -HIGH const val LOW = -HIGH
const val LOWEST = -HIGHEST const val LOWER = -HIGHER
const val LOWEST = Int.MIN_VALUE
} }
} }