🧼 Cleanup

Author: james090500

src/main/java/com/james090500/client/ClientInput.java

@@ -1,7 +1,6 @@
 package com.james090500.client;
 
 import com.james090500.BlockGame;
-import com.james090500.gui.DebugScreen;
 import com.james090500.gui.Screen;
 import com.james090500.gui.ScreenManager;
 import lombok.Getter;

src/main/java/com/james090500/client/LocalPlayer.java

@@ -12,6 +12,7 @@
 import com.james090500.utils.SoundManager;
 import com.james090500.world.ChunkStatus;
 import lombok.Getter;
+import lombok.Setter;
 import org.joml.Vector3f;
 import org.joml.Vector3i;
 
@@ -32,6 +33,7 @@ public class LocalPlayer {
     private boolean swimming = false;
 
     Clock clock = new Clock();
+    private final Camera camera;
     private final AABB aabb;
     private final float playerWidth = 0.4f;
     private final float playerHeight = 1.75f;
@@ -40,6 +42,10 @@ public class LocalPlayer {
     private double jumpStartTime = 0;
     private float stepCooldown;
     private String worldName;
+    @Getter @Setter
+    private int lastChunkX;
+    @Getter @Setter
+    private int lastChunkZ;
 
     BlockOverlay blockOverlay = new BlockOverlay();
     ArmOverlay armOverlay = new ArmOverlay();
@@ -48,10 +54,10 @@ public class LocalPlayer {
     public LocalPlayer() {
         this.aabb = new AABB(playerWidth, playerHeight);
         this.worldName = BlockGame.getInstance().getWorld().getWorldName();
-        Camera camera = BlockGame.getInstance().getCamera();
+        camera = BlockGame.getInstance().getCamera();
 
         if(BlockGame.getInstance().getWorld().isRemote()) {
-            camera.setPosition(0, 100, 0);
+            setPosition(0, 100, 0);
         } else {
             File playerPath = new File("worlds/" + worldName + "/players");
             File playerData = new File(playerPath + "/player.dat");
@@ -68,7 +74,7 @@ public LocalPlayer() {
                     float pitch = raf.readFloat();
                     float yaw = raf.readFloat();
 
-                    camera.setPosition(x, y, z);
+                    setPosition(x, y, z);
                     camera.setRotation(pitch, yaw);
 
                 } catch (IOException e) {
@@ -82,14 +88,13 @@ public void savePlayer() {
         if(!BlockGame.getInstance().getWorld().isRemote()) {
             File playerPath = new File("worlds/" + worldName + "/players");
             File playerData = new File(playerPath + "/player.dat");
-            Camera camera = BlockGame.getInstance().getCamera();
 
             // Write to file
             try (RandomAccessFile raf = new RandomAccessFile(playerData, "rw")) {
                 raf.setLength(0);
-                raf.writeFloat(camera.getPosition().x);
-                raf.writeFloat(camera.getPosition().y);
-                raf.writeFloat(camera.getPosition().z);
+                raf.writeFloat(getPosition().x);
+                raf.writeFloat(getPosition().y);
+                raf.writeFloat(getPosition().z);
                 raf.writeFloat(camera.pitch);
                 raf.writeFloat(camera.yaw);
             } catch (IOException e) {
@@ -98,6 +103,14 @@ public void savePlayer() {
         }
     }
 
+    public Vector3f getPosition() {
+        return camera.getPosition();
+    }
+
+    public void setPosition(float x, float y, float z) {
+        camera.setPosition(x, y, z);
+    }
+
     private void updateControls() {
         HashMap<Integer, Boolean> keys = BlockGame.getInstance().getClientWindow().getClientInput().getKeys();
 
@@ -113,6 +126,8 @@ private void updateControls() {
      * @param {number} delta - Time since last frame.
      */
     private void updateMovement(double delta) {
+        if(!BlockGame.getInstance().getWorld().isChunkStatus(lastChunkX, lastChunkZ, ChunkStatus.FINISHED)) return;
+
         float moveSpeed = 0.9f;
         if (this.noclip) {
             moveSpeed = 10f;
@@ -121,11 +136,10 @@ private void updateMovement(double delta) {
         }
 
         // Get necessary references
-        Camera camera = BlockGame.getInstance().getCamera();
+        Vector3f playerPos = getPosition();
         HashMap<Integer, Boolean> keys = BlockGame.getInstance().getClientWindow().getClientInput().getKeys();
 
         // Current Block the player is in
-        Vector3f playerPos = new Vector3f(camera.getPosition());
         playerPos.y -= 1;
         Block currentBlock = BlockGame.getInstance().getWorld().getBlock(playerPos);
 
@@ -137,8 +151,8 @@ private void updateMovement(double delta) {
         dir.cross(new Vector3f(0, 1, 0), right);
 
         // Stop playing falling through the world
-        if (camera.getPosition().y < -30) {
-            camera.getPosition().y = 100;
+        if (getPosition().y < -30) {
+            getPosition().y = 100;
         }
 
         // Dampen movement
@@ -245,7 +259,7 @@ private void updateMovement(double delta) {
             if (velocity.lengthSquared() > 0.0004f && !this.falling && !this.jumping) {
                 stepCooldown -= delta; // deltaTime is the time since last frame
                 if (stepCooldown <= 0f) {
-                    Block blockAtFeet = BlockGame.getInstance().getWorld().getBlock(camera.getPosition().sub(new Vector3f(0, 2, 0)));
+                    Block blockAtFeet = BlockGame.getInstance().getWorld().getBlock(getPosition().sub(new Vector3f(0, 2, 0)));
                     if(blockAtFeet != null && blockAtFeet.getSound() != null) {
                         SoundManager.play("assets/sound/block/" + blockAtFeet.getSound(), 4);
                         stepCooldown = 0.5f; // play every half second while moving
@@ -261,8 +275,7 @@ private void updateMovement(double delta) {
      * Update interaction via mouse picking
      */
     private void updateInteraction() {
-        Camera camera = BlockGame.getInstance().getCamera();
-        Vector3f origin = new Vector3f(camera.getPosition());
+        Vector3f origin = new Vector3f(getPosition());
         Vector3f dir = new Vector3f(camera.getDirection()).normalize();
 
         Vector3i[] raycast = Raycast.block(origin, dir, 5f);
@@ -312,11 +325,11 @@ public void render() {
      * @returns {boolean} True if the move was successful.
      */
     public boolean tryMove(Vector3f velocity, int axis) {
-        Vector3f pos = new Vector3f(BlockGame.getInstance().getCamera().getPosition());
+        Vector3f pos = new Vector3f(getPosition());
         pos.setComponent(axis,pos.get(axis) + velocity.get(axis));
 
         if (!aabb.isColliding(pos) || this.noclip) {
-            BlockGame.getInstance().getCamera().setPosition(axis, pos.get(axis));
+            camera.setPosition(axis, pos.get(axis));
             return true;
         }
         return false;

src/main/java/com/james090500/entity/model/PlayerModel.java

@@ -8,12 +8,8 @@
 import org.joml.Vector3f;
 import org.lwjgl.system.MemoryUtil;
 
-import static org.lwjgl.opengl.GL11.GL_FLOAT;
-import static org.lwjgl.opengl.GL11.GL_TRIANGLES;
-import static org.lwjgl.opengl.GL11.GL_UNSIGNED_INT;
-import static org.lwjgl.opengl.GL11.glDrawElements;
+import static org.lwjgl.opengl.GL11.*;
 import static org.lwjgl.opengl.GL15.*;
-import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
 import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
 import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
 import static org.lwjgl.opengl.GL30.glBindVertexArray;

src/main/java/com/james090500/gui/DebugScreen.java

@@ -15,6 +15,13 @@ public DebugScreen() {
 
     @Override
     public void render() {
+        // Return if invalid
+        if(
+                BlockGame.getInstance().getWorld() == null ||
+                BlockGame.getInstance().getLocalPlayer() == null ||
+                BlockGame.getInstance().getCamera() == null
+        ) return;
+
         Vector3f position = BlockGame.getInstance().getCamera().getPosition();
         String playerPos = String.format("Position: %.2f, %.2f, %.2f", position.x, position.y, position.z);
 

src/main/java/com/james090500/network/NettyHandler.java

@@ -12,9 +12,6 @@
 import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.nio.NioSocketChannel;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-
 public class NettyHandler {
 
     private final String host;

src/main/java/com/james090500/world/World.java

@@ -3,16 +3,15 @@
 import com.james090500.BlockGame;
 import com.james090500.blocks.Block;
 import com.james090500.blocks.Blocks;
+import com.james090500.client.LocalPlayer;
 import com.james090500.entity.Entity;
-import com.james090500.entity.PlayerEntity;
 import com.james090500.network.packets.BlockUpdatePacket;
 import com.james090500.network.packets.DisconnectPacket;
 import com.james090500.renderer.RenderManager;
 import com.james090500.utils.SoundManager;
 import com.james090500.utils.ThreadUtil;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMaps;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import lombok.Getter;
 import lombok.Setter;
@@ -39,9 +38,6 @@ public record ChunkOffset(int dx, int dz, int distSq) {}
 
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
 
-    private int lastPlayerX;
-    private int lastPlayerZ;
-
     @Getter
     private int worldSeed;
 
@@ -256,9 +252,9 @@ public void loadRemoteChunk(int chunkX, int chunkZ, byte[] chunkData) {
      * update the world. This also loads and remove chunks as needed
      */
     public void update() {
-        Vector3f playerPos = BlockGame.getInstance().getCamera().getPosition();
-        int playerChunkX = (int) Math.floor(playerPos.x / 16);
-        int playerChunkZ = (int) Math.floor(playerPos.z / 16);
+        LocalPlayer player = BlockGame.getInstance().getLocalPlayer();
+        int playerChunkX = (int) Math.floor(player.getPosition().x / 16);
+        int playerChunkZ = (int) Math.floor(player.getPosition().z / 16);
 
         // Load/generate nearby chunks in render distance
         List<ChunkOffset> offsets = new ArrayList<>();
@@ -283,7 +279,7 @@ public void update() {
         }
 
         // No point looping if we aren't moving
-        if(playerChunkX == lastPlayerX && playerChunkZ == lastPlayerZ && !this.forceUpdate) return;
+        if(playerChunkX == player.getLastChunkX() && playerChunkZ == player.getLastChunkZ() && !this.forceUpdate) return;
 
         // Render chunks from players pos.
         Set<ChunkPos> requiredChunks = new HashSet<>();
@@ -329,8 +325,8 @@ public void update() {
             return false;
         });
 
-        this.lastPlayerX = playerChunkX;
-        this.lastPlayerZ = playerChunkZ;
+        player.setLastChunkX(playerChunkX);
+        player.setLastChunkZ(playerChunkZ);
         this.forceUpdate = false;
     }