Rename methods, address review comments

Author: NotStirred

chunky/src/java/se/llbit/chunky/map/WorldMapLoader.java

@@ -83,7 +83,7 @@ public void loadWorld(World newWorld) {
     boolean isSameWorld = !(this.world instanceof EmptyWorld) && newWorld.getWorldDirectory().equals(this.world.getWorldDirectory());
 
     Optional<String> dimensionToLoad = Optional.of(world.currentDimension())
-      .map(Dimension::id)
+      .map(Dimension::getId)
       .filter(dimension -> newWorld.availableDimensions().contains(dimension))
       .or(newWorld::defaultDimension)
       .or(() -> newWorld.availableDimensions().stream().findFirst());

chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java

@@ -792,7 +792,7 @@ public synchronized void loadChunks(TaskTracker taskTracker, World world, Collec
 
       loadedWorld = world;
       worldPath = loadedWorld.getWorldDirectory().getAbsolutePath();
-      worldDimension = world.currentDimension().id();
+      worldDimension = world.currentDimension().getId();
 
       if (chunksToLoad.isEmpty()) {
         return;

chunky/src/java/se/llbit/chunky/ui/ChunkMap.java

@@ -585,7 +585,7 @@ private void drawPlayers(GraphicsContext gc) {
     World world = mapLoader.getWorld();
     double blockScale = mapView.scale / 16.;
     for (PlayerEntityData player : world.currentDimension().getPlayerPositions()) {
-      if (player.dimension.equals(world.currentDimension().id())) {
+      if (player.dimension.equals(world.currentDimension().getId())) {
         int px = (int) QuickMath.floor(player.x * blockScale);
         int py = (int) QuickMath.floor(player.y);
         int pz = (int) QuickMath.floor(player.z * blockScale);

chunky/src/java/se/llbit/chunky/world/Dimension.java

@@ -48,7 +48,15 @@ protected Dimension(World world, String dimensionId, Set<PlayerEntityData> playe
     this.timestamp = timestamp;
   }
 
-  public String id() {
+  /**
+   * @return A user presentable name of the dimension
+   */
+  public abstract String getName();
+
+  /**
+   * @return The dimension id, such as: {@code minecraft:overworld} (See {@link World#OVERWORLD_DIMENSION_ID})
+   */
+  public String getId() {
     return dimensionId;
   }
 
@@ -114,11 +122,6 @@ public Heightmap getHeightmap() {
     return heightmap;
   }
 
-  /**
-   * @return A user presentable name of the dimension
-   */
-  public abstract String toString();
-
   /** Add a chunk deletion listener. */
   public void addChunkDeletionListener(ChunkDeletionListener listener) {
     synchronized (chunkDeletionListeners) {

chunky/src/java/se/llbit/chunky/world/EmptyDimension.java

@@ -38,7 +38,7 @@ public RegionChangeWatcher createRegionChangeWatcher(WorldMapLoader worldMapLoad
     return new MCRegionChangeWatcher(worldMapLoader, mapView);
   }
 
-  @Override public String toString() {
+  @Override public String getName() {
     return "[empty dimension]";
   }
 

chunky/src/java/se/llbit/chunky/world/ImposterCubicChunk.java

@@ -113,7 +113,7 @@ private void loadSurfaceCubic(Map<Integer, Map<String, Tag>> data, ChunkData chu
 
     int[] heightmapData = extractHeightmapDataCubic(null, chunkData);
     updateHeightmap(heightmap, position, chunkData, heightmapData, palette, yMax);
-    surface = new SurfaceLayer(JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(dimension.id()), chunkData, palette, biomePalette, yMin, yMax, heightmapData);
+    surface = new SurfaceLayer(JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(dimension.getId()), chunkData, palette, biomePalette, yMin, yMax, heightmapData);
   }
 
   private int[] extractHeightmapDataCubic(Map<String, Tag> cubeData, ChunkData chunkData) {

chunky/src/java/se/llbit/chunky/world/JavaChunk.java

@@ -133,7 +133,7 @@ private void loadSurface(@NotNull Tag data, ChunkData chunkData, int yMin, int y
         int[] heightmapData = extractHeightmapData(data, chunkData);
         updateHeightmap(heightmap, position, chunkData, heightmapData, palette, yMax);
 
-        surface = new SurfaceLayer(JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(dimension.id()), chunkData, palette, biomePalette, yMin, yMax, heightmapData);
+        surface = new SurfaceLayer(JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(dimension.getId()), chunkData, palette, biomePalette, yMin, yMax, heightmapData);
         queueTopography();
       }
     } else {

chunky/src/java/se/llbit/chunky/world/JavaDimension.java

@@ -33,7 +33,7 @@ public synchronized boolean reloadPlayerData() {
     boolean changed = ((JavaWorld) this.world).reloadPlayerData();
     if (changed) {
       this.setPlayerEntities(((JavaWorld) this.world).playerEntities.stream()
-        .filter(player -> player.dimension.equals(this.id()))
+        .filter(player -> player.dimension.equals(this.getId()))
         .collect(Collectors.toSet()));
     }
     return changed;
@@ -121,7 +121,7 @@ public boolean regionExistsWithinRange(RegionPosition pos, int minY, int maxY) {
   /**
    * @return File object pointing to the region file directory
    */
-  public synchronized File getRegionDirectory() {
+  public File getRegionDirectory() {
     return new File(getDimensionDirectory(), "region");
   }
 
@@ -134,12 +134,12 @@ public Date getLastModified() {
    *
    * @return File object pointing to the data directory
    */
-  protected synchronized File getDimensionDirectory() {
+  protected File getDimensionDirectory() {
     return dimensionDirectory;
   }
 
   @Override
-  public String toString() {
+  public String getName() {
     return dimensionDirectory.getName() ;
   }
 }

chunky/src/java/se/llbit/chunky/world/JavaWorld.java

@@ -71,7 +71,7 @@ public class JavaWorld extends World {
     new String[] { NETHER_DIMENSION_ID, OVERWORLD_DIMENSION_ID, END_DIMENSION_ID }
   ));
 
-  protected int versionId;
+  protected final int versionId;
 
   /**
    * In a java world player data is per-world and not per-dimension, so we store it here.
@@ -89,10 +89,12 @@ public class JavaWorld extends World {
    * @param seed
    * @param timestamp
    */
-  protected JavaWorld(String levelName, File worldDirectory, long seed, long timestamp, Set<PlayerEntityData> playerEntities, Vector3i spawnPos) {
+  protected JavaWorld(String levelName, File worldDirectory, long seed, long timestamp, Set<PlayerEntityData> playerEntities, Vector3i spawnPos, int gameMode, int versionId) {
     super(levelName, worldDirectory, seed, timestamp);
     this.playerEntities = playerEntities;
     this.spawnPos = spawnPos;
+    this.gameMode = gameMode;
+    this.versionId = versionId;
   }
 
   @Override
@@ -164,11 +166,7 @@ public static World loadWorld(File worldDirectory, LoggedWarnings warnings) {
         spawnPos = new Vector3i(0, 0, 0);
       }
 
-      JavaWorld world = new JavaWorld(levelName, worldDirectory, seed, modtime, playerEntities, spawnPos);
-      world.gameMode = gameType.intValue(0);
-      world.versionId = versionId.intValue();
-
-      return world;
+      return new JavaWorld(levelName, worldDirectory, seed, modtime, playerEntities, spawnPos, gameType.intValue(0), versionId.intValue());
     } catch (FileNotFoundException e) {
       if (warnings == LoggedWarnings.NORMAL) {
         Log.infof("Could not find level.dat file for world %s!", levelName);
@@ -293,8 +291,8 @@ public synchronized void exportChunksToZip(File target, Collection<ChunkPosition
     progress.setJobSize(regionMap.size() + 1);
 
     String regionDirectory =
-      currentDim.id().equals(JavaWorld.OVERWORLD_DIMENSION_ID) ? currentDim.getDimensionDirectory().getName() :
-        currentDim.getDimensionDirectory().getName() + "/DIM" + JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(currentDim.id());
+      currentDim.getId().equals(JavaWorld.OVERWORLD_DIMENSION_ID) ? currentDim.getDimensionDirectory().getName() :
+        currentDim.getDimensionDirectory().getName() + "/DIM" + JavaWorld.VANILLA_DIMENSION_ID_TO_IDX.get(currentDim.getId());
     regionDirectory += "/region";
 
     try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(target))) {

chunky/src/java/se/llbit/chunky/world/worldformat/WorldFormat.java

@@ -39,9 +39,6 @@ static Optional<World> loadWorld(File dir) {
     return worldsByFormat.values().stream().findFirst();
   }
 
-  /**
-   * @return The user-recognisable name of the world format. Shown to the user if this format has issues or throws.
-   */
   String name();
 
   /**