Small fixes and optimisations (#771)

* fix == vs equals in map blend colour * Optimised chunkVersion check * Various simplifications * Update chunky/src/java/se/llbit/chunky/renderer/scene/SynchronousSceneManager.java Co-authored-by: Maik Marschner <[email protected]>
chunky-dev · Jan 14, 2021 · 309950f · 309950f
1 parent 23cb133
commit 309950f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/map/SurfaceLayer.java b/chunky/src/java/se/llbit/chunky/map/SurfaceLayer.java
@@ -26,7 +26,6 @@
 import se.llbit.chunky.block.Vine;
 import se.llbit.chunky.chunk.BlockPalette;
 import se.llbit.chunky.chunk.ChunkData;
-import se.llbit.chunky.resources.Texture;
 import se.llbit.chunky.world.Biomes;
 import se.llbit.chunky.world.Chunk;
 import se.llbit.chunky.world.ChunkPosition;
@@ -80,7 +79,7 @@ public SurfaceLayer(int dim, ChunkData chunkData, BlockPalette palette) {
 
         float[] color = new float[4];
 
-        for (; y >= minY && color[3] < 1.f; ) {
+        while (y >= minY && color[3] < 1.f) {
           Block block = palette.get(chunkData.getBlockAt(x, y, z));
           float[] blockColor = new float[4];
           ColorUtil.getRGBAComponents(block.texture.getAvgColor(), blockColor);
@@ -97,7 +96,7 @@ public SurfaceLayer(int dim, ChunkData chunkData, BlockPalette palette) {
             blockColor[3] = 1.f;// grass colors don't include alpha
 
             y -= 1;
-          } else if (block.name == "minecraft:ice") {
+          } else if (block.name.equals("minecraft:ice")) {
             color = blend(color, blockColor);
             y -= 1;
 

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/AsynchronousSceneManager.java b/chunky/src/java/se/llbit/chunky/renderer/scene/AsynchronousSceneManager.java
@@ -243,10 +243,7 @@ public static boolean isValidSceneNameChar(char c) {
     if (c < '\u0020') {
       return false;
     }
-    if (c > '\u007e' && c < '\u00a0') {
-      return false;
-    }
-    return true;
+    return c <= '\u007e' || c >= '\u00a0';
   }
 
   /**

diff --git a/chunky/src/java/se/llbit/chunky/renderer/scene/SynchronousSceneManager.java b/chunky/src/java/se/llbit/chunky/renderer/scene/SynchronousSceneManager.java
@@ -222,10 +222,9 @@ public void setOnChunksLoaded(Runnable onChunksLoaded) {
   @Override public boolean pollSceneStateChange() {
     if (scene.shouldRefresh() && (scene.getForceReset() || resetHandler.allowSceneRefresh())) {
       return true;
-    } else if (scene.getMode() != storedScene.getMode()) {
-      return true;
+    } else {
+      return scene.getMode() != storedScene.getMode();
     }
-    return false;
   }
 
   @Override public void withSceneProtected(Consumer<Scene> fun) {

diff --git a/chunky/src/java/se/llbit/chunky/world/Chunk.java b/chunky/src/java/se/llbit/chunky/world/Chunk.java
@@ -268,18 +268,17 @@ private int[] extractHeightmapData(@NotNull Map<String, Tag> data, ChunkData chu
   /** Detect Minecraft version that generated the chunk. */
   private static String chunkVersion(@NotNull Map<String, Tag> data) {
     Tag sections = data.get(LEVEL_SECTIONS);
-    String version = "?";
     if (sections.isList()) {
-      version = "1.13";
       for (SpecificTag section : sections.asList()) {
         if (!section.get("Palette").isList()) {
-          if (!version.equals("?") && section.get("Blocks").isByteArray(SECTION_BYTES)) {
-            version = "1.12";
+          if (section.get("Blocks").isByteArray(SECTION_BYTES)) {
+            return "1.12";
           }
         }
       }
+      return "1.13";
     }
-    return version;
+    return "?";
   }
 
   private static void loadBlockData(@NotNull Map<String, Tag> data, @NotNull ChunkData chunkData,