Add text renderer

Author: squid233

.idea/copyright/lgpl.xml

@@ -7,3 +7,5 @@ A 3D sandbox game.
 Math codes are from [JOML](https://github.com/JOML-CI/JOML).
 
 Block textures are from [Squareful](https://www.curseforge.com/minecraft/texture-packs/xekr-square-pattern) by XeKr redistributed under [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.zh) License.
+
+Font hexadecimal data uses [Unifont 15.1.05](https://www.unifoundry.com/unifont/index.html). 

README.md

@@ -326,6 +326,6 @@ if (hasPublication.toBoolean() && publicationRepo != null) {
 
 dependencies {
     constraints {
-        gameModules.forEach { api("io.github.xenfork:${it.artifactId}:${it.version}") }
+        gameModules.forEach { api("$projGroupId:${it.artifactId}:${it.version}") }
     }
 }

build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
     application
 }
 
+val clientVersion: String by rootProject
 val jdkEnablePreview: String by rootProject
 val overrunglVersion: String by rootProject
 
@@ -72,3 +73,13 @@ application {
         )
     }
 }
+
+tasks.processResources {
+    val map = mapOf(
+        "client_version" to clientVersion
+    )
+    inputs.properties(map)
+    filesMatching("client_version.json") {
+        expand(map)
+    }
+}

doc/legal/LICENSE_Unifont.txt

@@ -4,8 +4,8 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * only version 2.1 of the License.
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 package freeworld.client;
@@ -15,7 +15,6 @@
 import freeworld.client.render.GameRenderer;
 import freeworld.client.render.RenderSystem;
 import freeworld.client.render.gl.GLStateMgr;
-import freeworld.client.render.model.block.BlockModelManager;
 import freeworld.client.render.screen.Screen;
 import freeworld.client.render.screen.ingame.CreativeTabScreen;
 import freeworld.client.render.screen.ingame.PauseScreen;
@@ -55,8 +54,8 @@
  * @author squid233
  * @since 0.1.0
  */
-public final class Freeworld implements AutoCloseable {
-    private static final Freeworld INSTANCE = new Freeworld();
+public final class FreeworldClient implements AutoCloseable {
+    private static final FreeworldClient INSTANCE = new FreeworldClient();
     private static final Logger logger = Logging.caller();
     private static final int INIT_WINDOW_WIDTH = 854;
     private static final int INIT_WINDOW_HEIGHT = 480;
@@ -71,7 +70,6 @@ public final class Freeworld implements AutoCloseable {
     private final Camera camera = new Camera();
     private MouseInput mouseInput;
     private GameRenderer gameRenderer;
-    private BlockModelManager blockModelManager;
     private World world;
     private PlayerEntity player;
     @Nullable
@@ -81,8 +79,9 @@ public final class Freeworld implements AutoCloseable {
     private int blockPlaceTimer = 0;
     private int gameTick = 0;
     private int spaceTick = 0;
+    private boolean debugHudEnabled = false;
 
-    private Freeworld() {
+    private FreeworldClient() {
         this.glfw = GLFW.INSTANCE;
     }
 
@@ -109,7 +108,7 @@ public void start() {
             throw new IllegalStateException("Failed to create GLFW window");
         }
 
-        mouseInput = new MouseInput(window);
+        mouseInput = new MouseInput(this, window);
         CursorPosEvent.DISABLED.subscribe(this::onCursorPosDisabled);
         glfw.setKeyCallback(window, (_, key, scancode, action, mods) -> onKey(key, scancode, action, mods));
         glfw.setFramebufferSizeCallback(window, (_, width, height) -> onResize(width, height));
@@ -168,6 +167,7 @@ private void onKey(int key, int scancode, int action, int mods) {
                                         }
                                         spaceTick = gameTick;
                                     }
+                                    case GLFW.KEY_F3 -> debugHudEnabled = !debugHudEnabled;
                                 }
                             }
                         } else {
@@ -313,9 +313,6 @@ private void initGL() {
 
         RenderSystem.initialize(gl);
 
-        blockModelManager = new BlockModelManager();
-        blockModelManager.bootstrap();
-
         EntityRenderers.bootstrap();
 
         gameRenderer = new GameRenderer(this);
@@ -407,10 +404,6 @@ public GameRenderer gameRenderer() {
         return gameRenderer;
     }
 
-    public BlockModelManager blockModelManager() {
-        return blockModelManager;
-    }
-
     public World world() {
         return world;
     }
@@ -423,7 +416,11 @@ public float guiScale() {
         return guiScale;
     }
 
-    public static Freeworld getInstance() {
+    public boolean debugHudEnabled() {
+        return debugHudEnabled;
+    }
+
+    public static FreeworldClient getInstance() {
         return INSTANCE;
     }
 }

modules/freeworld.client/build.gradle.kts

@@ -4,8 +4,8 @@
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * only version 2.1 of the License.
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 package freeworld.client;
@@ -20,15 +20,16 @@
  * @since 0.1.0
  */
 public final class MouseInput {
-    private final GLFW glfw = GLFW.INSTANCE;
+    private final GLFW glfw;
     private final MemorySegment window;
     private double cursorX;
     private double cursorY;
     private double cursorDeltaX;
     private double cursorDeltaY;
     private boolean disabled = false;
 
-    public MouseInput(MemorySegment window) {
+    public MouseInput(FreeworldClient client, MemorySegment window) {
+        this.glfw = client.glfw();
         this.window = window;
         glfw.setCursorPosCallback(window, (_, x, y) -> {
             cursorDeltaX = x - cursorX;

modules/freeworld.client/src/main/java/freeworld/client/Freeworld.java renamed to modules/freeworld.client/src/main/java/freeworld/client/FreeworldClient.java

@@ -10,7 +10,7 @@
 
 package freeworld.client.main;
 
-import freeworld.client.Freeworld;
+import freeworld.client.FreeworldClient;
 
 /**
  * The main class
@@ -28,7 +28,7 @@ private Main() {
      * @param args arguments
      */
     public static void main(String[] args) {
-        try (Freeworld game = Freeworld.getInstance()) {
+        try (FreeworldClient game = FreeworldClient.getInstance()) {
             game.start();
         }
     }