Skip to content

Commit cad04a6

Browse files
Ingrim4Ingrim4
committed
fix: nullability for region file cache
1 parent e0a26b8 commit cad04a6

19 files changed

Lines changed: 73 additions & 19 deletions

File tree

‎orebfuscator-core/src/main/java/dev/imprex/orebfuscator/cache/AbstractRegionFileCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private void remove(Map.Entry<Path, T> entry) {
7272
}
7373
}
7474

75-
protected final T get(Path path) throws IOException {
75+
private T get(Path path) throws IOException {
7676
this.lock.readLock().lock();
7777
try {
7878
T t = this.regionFiles.get(path);

‎orebfuscator-nms/orebfuscator-nms-v1_16_R3/src/main/java/net/imprex/orebfuscator/nms/v1_16_R3/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.server.v1_16_R3.RegionFile;
1313
import net.minecraft.server.v1_16_R3.RegionFileCompression;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.a(new ChunkCoordIntPair(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_17_R1/src/main/java/net/imprex/orebfuscator/nms/v1_17_R1/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_18_R1/src/main/java/net/imprex/orebfuscator/nms/v1_18_R1/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_18_R2/src/main/java/net/imprex/orebfuscator/nms/v1_18_R2/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_19_R1/src/main/java/net/imprex/orebfuscator/nms/v1_19_R1/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_19_R2/src/main/java/net/imprex/orebfuscator/nms/v1_19_R2/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_19_R3/src/main/java/net/imprex/orebfuscator/nms/v1_19_R3/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_20_R1/src/main/java/net/imprex/orebfuscator/nms/v1_20_R1/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

‎orebfuscator-nms/orebfuscator-nms-v1_20_R2/src/main/java/net/imprex/orebfuscator/nms/v1_20_R2/RegionFileCache.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
import net.minecraft.world.level.chunk.storage.RegionFile;
1313
import net.minecraft.world.level.chunk.storage.RegionFileVersion;
1414
import org.bukkit.Bukkit;
15+
import org.jspecify.annotations.NullMarked;
16+
import org.jspecify.annotations.Nullable;
1517

18+
@NullMarked
1619
public class RegionFileCache extends AbstractRegionFileCache<RegionFile> {
1720

1821
RegionFileCache(CacheConfig cacheConfig) {
@@ -31,7 +34,7 @@ protected void closeRegionFile(RegionFile t) throws IOException {
3134
}
3235

3336
@Override
34-
protected DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
37+
protected @Nullable DataInputStream createInputStream(RegionFile t, ChunkCacheKey key) throws IOException {
3538
return t.getChunkDataInputStream(new ChunkPos(key.x(), key.z()));
3639
}
3740

0 commit comments

Comments
 (0)