Skip to content

Commit 56e05d9

Browse files
NotStirredNotStirred
committed
Rename MC_ classes to Java_
1 parent 86a8740 commit 56e05d9

9 files changed

Lines changed: 49 additions & 55 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
import se.llbit.chunky.world.biome.Biome;
5454
import se.llbit.chunky.world.biome.BiomePalette;
5555
import se.llbit.chunky.world.biome.Biomes;
56+
import se.llbit.chunky.world.region.Region;
5657
import se.llbit.chunky.world.worldformat.WorldFormats;
57-
import se.llbit.chunky.world.region.MCRegion;
5858
import se.llbit.json.*;
5959
import se.llbit.log.Log;
6060
import se.llbit.math.*;
@@ -864,8 +864,8 @@ public synchronized void loadChunks(TaskTracker taskTracker, World world, Map<Re
864864

865865
ExecutorService executor = Executors.newSingleThreadExecutor();
866866

867-
ChunkData[] regionParsingDataArray = new ChunkData[MCRegion.CHUNKS_X * MCRegion.CHUNKS_Z];
868-
ChunkData[] chunkLoadingDataArray = new ChunkData[MCRegion.CHUNKS_X * MCRegion.CHUNKS_Z];
867+
ChunkData[] regionParsingDataArray = new ChunkData[Region.CHUNKS_X * Region.CHUNKS_Z];
868+
ChunkData[] chunkLoadingDataArray = new ChunkData[Region.CHUNKS_X * Region.CHUNKS_Z];
869869

870870
BiFunction<RegionPosition, ChunkData[], Future<List<ObjectObjectImmutablePair<ChunkPosition, ChunkData>>>> createRegionDataFuture = (regionPosition, chunkDataArray) -> executor.submit(() -> {
871871
List<ChunkPosition> chunkPositionsToLoad = chunksToLoadByRegion.get(regionPosition);

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,16 @@
1919

2020
import javafx.application.Platform;
2121
import javafx.geometry.Point2D;
22-
import javafx.geometry.Pos;
2322
import javafx.scene.Scene;
2423
import javafx.scene.canvas.Canvas;
2524
import javafx.scene.canvas.GraphicsContext;
2625
import javafx.scene.control.*;
27-
import javafx.scene.control.Button;
28-
import javafx.scene.control.Dialog;
2926
import javafx.scene.control.MenuItem;
30-
import javafx.scene.image.Image;
3127
import javafx.scene.image.ImageView;
3228
import javafx.scene.input.KeyEvent;
3329
import javafx.scene.input.MouseButton;
3430
import javafx.scene.input.MouseEvent;
3531
import javafx.scene.input.ScrollEvent;
36-
import javafx.scene.layout.Border;
37-
import javafx.scene.layout.GridPane;
3832
import javafx.stage.PopupWindow;
3933
import se.llbit.chunky.map.MapBuffer;
4034
import se.llbit.chunky.map.MapView;
@@ -45,19 +39,17 @@
4539
import se.llbit.chunky.renderer.scene.SceneManager;
4640
import se.llbit.chunky.ui.controller.ChunkyFxController;
4741
import se.llbit.chunky.ui.dialogs.SelectChunksInRadiusDialog;
48-
import se.llbit.chunky.ui.elements.TextFieldLabelWrapper;
4942
import se.llbit.chunky.world.*;
5043
import se.llbit.chunky.world.Dimension;
5144
import se.llbit.chunky.world.listeners.ChunkUpdateListener;
52-
import se.llbit.chunky.world.region.MCRegion;
45+
import se.llbit.chunky.world.region.Region;
5346
import se.llbit.log.Log;
5447
import se.llbit.math.*;
5548

5649
import java.awt.*;
5750
import java.io.File;
5851
import java.io.IOException;
5952
import java.util.Collection;
60-
import java.util.Optional;
6153
import java.util.concurrent.Executors;
6254
import java.util.concurrent.ScheduledExecutorService;
6355
import java.util.concurrent.TimeUnit;
@@ -227,8 +219,8 @@ public ChunkMap(WorldMapLoader loader, ChunkyFxController controller,
227219
if (view.chunkScale >= 16) {
228220
int minChunkX = region.x << 5;
229221
int minChunkZ = region.z << 5;
230-
for (int chunkX = minChunkX; chunkX < minChunkX + MCRegion.CHUNKS_X; chunkX++) {
231-
for (int chunkZ = minChunkZ; chunkZ < minChunkZ + MCRegion.CHUNKS_Z; chunkZ++) {
222+
for (int chunkX = minChunkX; chunkX < minChunkX + Region.CHUNKS_X; chunkX++) {
223+
for (int chunkZ = minChunkZ; chunkZ < minChunkZ + Region.CHUNKS_Z; chunkZ++) {
232224
mapBuffer.drawTile(mapLoader, new ChunkPosition(chunkX, chunkZ), chunkSelection);
233225
}
234226
}

‎chunky/src/java/se/llbit/chunky/world/ChunkSelectionTracker.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap;
2121
import se.llbit.chunky.world.listeners.ChunkDeletionListener;
2222
import se.llbit.chunky.world.listeners.ChunkUpdateListener;
23-
import se.llbit.chunky.world.region.MCRegion;
23+
import se.llbit.chunky.world.region.Region;
2424

2525
import java.util.*;
2626
import java.util.concurrent.ConcurrentHashMap;
@@ -42,7 +42,7 @@ public class ChunkSelectionTracker implements ChunkDeletionListener {
4242
*/
4343
private boolean setChunk(ChunkPosition pos, boolean selected) {
4444
long regionPosLong = ChunkPosition.positionToLong(pos.x >> 5, pos.z >> 5);
45-
BitSet selectedChunksForRegion = selectedChunksByRegion.computeIfAbsent(regionPosLong, p -> new BitSet(MCRegion.CHUNKS_X * MCRegion.CHUNKS_Z));
45+
BitSet selectedChunksForRegion = selectedChunksByRegion.computeIfAbsent(regionPosLong, p -> new BitSet(Region.CHUNKS_X * Region.CHUNKS_Z));
4646
int bitIndex = (pos.x & 31) + ((pos.z & 31) << 5);
4747
boolean previousValue = selectedChunksForRegion.get(bitIndex);
4848
if(previousValue != selected) {
@@ -75,7 +75,7 @@ private boolean setChunk(Dimension dimension, ChunkPosition pos, boolean selecte
7575
* @return Whether the selection changed
7676
*/
7777
private boolean setChunksWithinRegion(Dimension dimension, RegionPosition regionPos, int minX, int maxX, int minZ, int maxZ, boolean selected) {
78-
BitSet selectedChunksForRegion = selectedChunksByRegion.computeIfAbsent(regionPos.getLong(), p -> new BitSet(MCRegion.CHUNKS_X * MCRegion.CHUNKS_Z));
78+
BitSet selectedChunksForRegion = selectedChunksByRegion.computeIfAbsent(regionPos.getLong(), p -> new BitSet(Region.CHUNKS_X * Region.CHUNKS_Z));
7979

8080
Collection<ChunkPosition> changedChunks = new ArrayList<>();
8181
boolean selectionChanged = false;
@@ -249,15 +249,15 @@ public synchronized boolean setChunks(Dimension dimension, int minChunkX, int mi
249249
boolean selectionChanged = false;
250250

251251
// If selection area must contain complete regions
252-
if(maxChunkX - minChunkX >= MCRegion.CHUNKS_X*2 && maxChunkZ - minChunkZ >= MCRegion.CHUNKS_Z*2) {
252+
if(maxChunkX - minChunkX >= Region.CHUNKS_X*2 && maxChunkZ - minChunkZ >= Region.CHUNKS_Z*2) {
253253
// All full regions are set first, then any chunks on the borders are set, top and bottom include corners, left and right don't
254254

255255
// left, right, top, bottom are unrelated to the actual map view, and are just treating XZ as if they were XY on traditional cartesian coordinate axes
256-
int leftBorder = MCRegion.CHUNKS_X - (minChunkX & (MCRegion.CHUNKS_X-1)); // want the border from minimum region corner to minimum chunk corner, so 32 - borderSize
257-
int rightBorder = maxChunkX & (MCRegion.CHUNKS_X-1);
256+
int leftBorder = Region.CHUNKS_X - (minChunkX & (Region.CHUNKS_X-1)); // want the border from minimum region corner to minimum chunk corner, so 32 - borderSize
257+
int rightBorder = maxChunkX & (Region.CHUNKS_X-1);
258258

259-
int bottomBorder = MCRegion.CHUNKS_Z - (minChunkZ & (MCRegion.CHUNKS_Z-1));
260-
int topBorder = maxChunkZ & (MCRegion.CHUNKS_Z-1);
259+
int bottomBorder = Region.CHUNKS_Z - (minChunkZ & (Region.CHUNKS_Z-1));
260+
int topBorder = maxChunkZ & (Region.CHUNKS_Z-1);
261261

262262
int minInnerRegionX = (minChunkX + leftBorder) >> 5;
263263
int maxInnerRegionX = (maxChunkX - rightBorder) >> 5;
@@ -397,9 +397,9 @@ public synchronized Map<RegionPosition, List<ChunkPosition>> getSelectionByRegio
397397
selectedChunksByRegion.forEach((regionPosition, selectedChunksBitSet) -> {
398398
RegionPosition regionPos = new RegionPosition(regionPosition);
399399
List<ChunkPosition> positions = new ArrayList<>();
400-
for (int localX = 0; localX < MCRegion.CHUNKS_X; localX++) {
401-
for (int localZ = 0; localZ < MCRegion.CHUNKS_Z; localZ++) {
402-
int idx = localX + (localZ * MCRegion.CHUNKS_X);
400+
for (int localX = 0; localX < Region.CHUNKS_X; localX++) {
401+
for (int localZ = 0; localZ < Region.CHUNKS_Z; localZ++) {
402+
int idx = localX + (localZ * Region.CHUNKS_X);
403403
if(selectedChunksBitSet.get(idx)) {
404404
positions.add(regionPos.asChunkPosition(localX, localZ));
405405
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import se.llbit.chunky.world.*;
1414
import se.llbit.chunky.world.biome.ArrayBiomePalette;
1515
import se.llbit.chunky.world.biome.BiomePalette;
16-
import se.llbit.chunky.world.region.MCRegion;
16+
import se.llbit.chunky.world.java.region.JavaRegion;
1717
import se.llbit.chunky.world.region.Region;
1818
import se.llbit.log.Log;
1919
import se.llbit.math.QuickMath;
@@ -42,7 +42,7 @@ public JavaChunk(ChunkPosition pos, Dimension dimension) {
4242
* @return loaded data, or null if something went wrong
4343
*/
4444
private Map<String, Tag> getChunkTags(Set<String> request) throws ChunkLoadingException {
45-
MCRegion region = (MCRegion) dimension.getRegion(position.getRegionPosition());
45+
JavaRegion region = (JavaRegion) dimension.getRegion(position.getRegionPosition());
4646
Mutable<Integer> timestamp = new Mutable<>(dataTimestamp);
4747
Map<String, Tag> chunkTags = region.getChunkTags(this.position, request, timestamp);
4848
this.dataTimestamp = timestamp.get();
@@ -54,7 +54,7 @@ private Map<String, Tag> getChunkTags(Set<String> request) throws ChunkLoadingEx
5454
* @return loaded data, or null if something went wrong
5555
*/
5656
private Map<String, Tag> getEntityTags(Set<String> request) throws ChunkLoadingException {
57-
MCRegion region = (MCRegion) dimension.getRegion(position.getRegionPosition());
57+
JavaRegion region = (JavaRegion) dimension.getRegion(position.getRegionPosition());
5858
return region.getEntityTags(this.position, request);
5959
}
6060

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import se.llbit.chunky.map.MapView;
88
import se.llbit.chunky.map.WorldMapLoader;
99
import se.llbit.chunky.world.*;
10+
import se.llbit.chunky.world.java.region.JavaRegion;
11+
import se.llbit.chunky.world.java.region.JavaRegionChangeWatcher;
1012
import se.llbit.chunky.world.region.*;
1113
import se.llbit.math.Vector3;
1214
import se.llbit.math.Vector3i;
@@ -34,12 +36,12 @@ protected JavaDimension(JavaWorld world, Identifier dimensionId, File dimensionD
3436

3537
@Override
3638
public RegionChangeWatcher createRegionChangeWatcher(WorldMapLoader worldMapLoader, MapView mapView) {
37-
return new MCRegionChangeWatcher(worldMapLoader, mapView);
39+
return new JavaRegionChangeWatcher(worldMapLoader, mapView);
3840
}
3941

4042
@Override
4143
public Region createRegion(RegionPosition pos) {
42-
return new MCRegion(pos, this);
44+
return new JavaRegion(pos, this);
4345
}
4446

4547
/**

chunky/src/java/se/llbit/chunky/world/region/MCRegion.java renamed to chunky/src/java/se/llbit/chunky/world/java/region/JavaRegion.java

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with Chunky. If not, see <http://www.gnu.org/licenses/>.
1616
*/
17-
package se.llbit.chunky.world.region;
17+
package se.llbit.chunky.world.java.region;
1818

1919
import java.io.*;
2020
import java.util.Iterator;
@@ -26,6 +26,8 @@
2626
import se.llbit.chunky.world.*;
2727
import se.llbit.chunky.world.java.JavaChunk;
2828
import se.llbit.chunky.world.java.JavaDimension;
29+
import se.llbit.chunky.world.region.ChunkReadException;
30+
import se.llbit.chunky.world.region.Region;
2931
import se.llbit.log.Log;
3032
import se.llbit.nbt.ErrorTag;
3133
import se.llbit.nbt.NamedTag;
@@ -44,19 +46,8 @@
4446
*
4547
* @author Jesper Öqvist <jesper@llbit.se>
4648
*/
47-
public class MCRegion implements Region {
48-
49-
/**
50-
* Region X chunk width
51-
*/
52-
public static final int CHUNKS_X = 32;
53-
54-
/**
55-
* Region Z chunk width
56-
*/
57-
public static final int CHUNKS_Z = 32;
58-
59-
private static final int NUM_CHUNKS = CHUNKS_X * CHUNKS_Z;
49+
public class JavaRegion implements Region {
50+
private static final int NUM_CHUNKS = Region.CHUNKS_X * Region.CHUNKS_Z;
6051

6152
/**
6253
* Sector size in bytes.
@@ -82,12 +73,12 @@ private static int getMCAChunkIndex(ChunkPosition chunkPos) {
8273
*
8374
* @param pos the region position
8475
*/
85-
public MCRegion(RegionPosition pos, JavaDimension dimension) {
76+
public JavaRegion(RegionPosition pos, JavaDimension dimension) {
8677
this.dimension = dimension;
8778
fileName = pos.getMcaName();
8879
position = pos;
89-
for (int z = 0; z < CHUNKS_Z; ++z) {
90-
for (int x = 0; x < CHUNKS_X; ++x) {
80+
for (int z = 0; z < Region.CHUNKS_Z; ++z) {
81+
for (int x = 0; x < Region.CHUNKS_X; ++x) {
9182
chunks[getMCAChunkIndex(x, z)] = EmptyChunk.INSTANCE;
9283
}
9384
}

chunky/src/java/se/llbit/chunky/world/region/MCRegionChangeWatcher.java renamed to chunky/src/java/se/llbit/chunky/world/java/region/JavaRegionChangeWatcher.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
* You should have received a copy of the GNU General Public License
1515
* along with Chunky. If not, see <http://www.gnu.org/licenses/>.
1616
*/
17-
package se.llbit.chunky.world.region;
17+
package se.llbit.chunky.world.java.region;
1818

1919
import javafx.application.Platform;
2020
import se.llbit.chunky.PersistentSettings;
2121
import se.llbit.chunky.map.MapView;
2222
import se.llbit.chunky.map.WorldMapLoader;
23-
import se.llbit.chunky.world.ChunkPosition;
2423
import se.llbit.chunky.world.ChunkView;
25-
import se.llbit.chunky.world.Dimension;
2624
import se.llbit.chunky.world.RegionPosition;
2725
import se.llbit.chunky.world.java.JavaDimension;
26+
import se.llbit.chunky.world.region.Region;
27+
import se.llbit.chunky.world.region.RegionChangeWatcher;
2828

2929
/**
3030
* Monitors filesystem for changes to region files.
3131
*
3232
* @author Jesper Öqvist <jesper@llbit.se>
3333
*/
34-
public class MCRegionChangeWatcher extends RegionChangeWatcher {
35-
public MCRegionChangeWatcher(WorldMapLoader loader, MapView mapView) {
34+
public class JavaRegionChangeWatcher extends RegionChangeWatcher {
35+
public JavaRegionChangeWatcher(WorldMapLoader loader, MapView mapView) {
3636
super(loader, mapView, "Region Refresher");
3737
}
3838

‎chunky/src/java/se/llbit/chunky/world/listeners/ChunkUpdateListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import se.llbit.chunky.world.ChunkPosition;
2020
import se.llbit.chunky.world.RegionPosition;
21-
import se.llbit.chunky.world.region.MCRegion;
21+
import se.llbit.chunky.world.region.Region;
2222

2323
import java.util.Collection;
2424

@@ -33,8 +33,8 @@ default void chunkUpdated(ChunkPosition chunkPosition) {}
3333
default void regionChunksUpdated(RegionPosition region) {
3434
int minChunkX = region.x << 5;
3535
int minChunkZ = region.z << 5;
36-
for (int chunkX = minChunkX; chunkX < minChunkX + MCRegion.CHUNKS_X; chunkX++) {
37-
for (int chunkZ = minChunkZ; chunkZ < minChunkZ + MCRegion.CHUNKS_Z; chunkZ++) {
36+
for (int chunkX = minChunkX; chunkX < minChunkX + Region.CHUNKS_X; chunkX++) {
37+
for (int chunkZ = minChunkZ; chunkZ < minChunkZ + Region.CHUNKS_Z; chunkZ++) {
3838
this.chunkUpdated(new ChunkPosition(chunkX, chunkZ));
3939
}
4040
}

‎chunky/src/java/se/llbit/chunky/world/region/Region.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
import se.llbit.chunky.world.RegionPosition;
77

88
public interface Region extends Iterable<Chunk> {
9+
/**
10+
* Region X chunk width
11+
*/
12+
int CHUNKS_X = 32;
13+
/**
14+
* Region Z chunk width
15+
*/
16+
int CHUNKS_Z = 32;
17+
918
/**
1019
* @return Chunk at (x, z)
1120
*/

0 commit comments

Comments
 (0)