diff --git a/ReadMe.md b/ReadMe.md index 0b02d5ec2..212dc5743 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -136,7 +136,7 @@ Not compatible (yet) 6. (Optional) Build a fat jar with `mvn package`. You'll find the jar with all dependencies in `target/`. Then you don't need to recompile everytime ## Code mirrors - +- [gitlab.bixilon.de](https://gitlab.bixilon.de/bixilon/minosoft/) (Main repository) - [GitLab](https://gitlab.com/Bixilon/minosoft) - [GitHub](https://github.com/Bixilon/Minosoft/) diff --git a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt index 6e71f6a23..e28a13f5c 100644 --- a/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt +++ b/src/main/java/de/bixilon/minosoft/config/StaticConfiguration.kt @@ -19,8 +19,4 @@ object StaticConfiguration { const val DEBUG_SLOW_LOADING = false // if true, many Thread.sleep will be executed and the start will be delayed (by a lot) const val SHOW_LOG_MESSAGES_IN_CHAT = false // prints all console messages in the chat box const val REPLACE_SYSTEM_OUT_STREAMS = true // Replace System.out and System.err with the custom Log system ones - - - @Deprecated(message = "Just for hud development purposes; Will be removed once hud is merged") - const val HUD_ONLY = false } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt index f6ce73ae3..77613c283 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt @@ -14,7 +14,6 @@ package de.bixilon.minosoft.gui.rendering import de.bixilon.minosoft.Minosoft -import de.bixilon.minosoft.config.StaticConfiguration import de.bixilon.minosoft.config.key.KeyAction import de.bixilon.minosoft.config.key.KeyBinding import de.bixilon.minosoft.config.key.KeyCodes @@ -127,20 +126,18 @@ class RenderWindow( } }) - if (!StaticConfiguration.HUD_ONLY) { - // order dependent (from back to front) - registerRenderer(SkyRenderer) - registerRenderer(WorldRenderer) - registerRenderer(BlockOutlineRenderer) - if (Minosoft.config.config.game.graphics.particles.enabled) { - registerRenderer(ParticleRenderer) - } - if (Minosoft.config.config.game.entities.hitBox.enabled) { - registerRenderer(EntityHitBoxRenderer) - } - if (Minosoft.config.config.game.world.chunkBorders.enabled) { - registerRenderer(ChunkBorderRenderer) - } + // order dependent (from back to front) + registerRenderer(SkyRenderer) + registerRenderer(WorldRenderer) + registerRenderer(BlockOutlineRenderer) + if (Minosoft.config.config.game.graphics.particles.enabled) { + registerRenderer(ParticleRenderer) + } + if (Minosoft.config.config.game.entities.hitBox.enabled) { + registerRenderer(EntityHitBoxRenderer) + } + if (Minosoft.config.config.game.world.chunkBorders.enabled) { + registerRenderer(ChunkBorderRenderer) } registerRenderer(HUDRenderer) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListHUDElement.kt index ef2a7c182..25127a221 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/tab/TabListHUDElement.kt @@ -56,8 +56,6 @@ class TabListHUDElement(hudRenderer: HUDRenderer) : LayoutedHUDElement