diff --git a/src/main/java/io/rudin/minetest/tileserver/MapBlockRenderer.java b/src/main/java/io/rudin/minetest/tileserver/MapBlockRenderer.java index 2bbc50b..de8d214 100644 --- a/src/main/java/io/rudin/minetest/tileserver/MapBlockRenderer.java +++ b/src/main/java/io/rudin/minetest/tileserver/MapBlockRenderer.java @@ -1,9 +1,6 @@ package io.rudin.minetest.tileserver; import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.zip.DataFormatException; @@ -17,6 +14,7 @@ import io.rudin.minetest.tileserver.accessor.MapBlockAccessor; import io.rudin.minetest.tileserver.config.Layer; import io.rudin.minetest.tileserver.config.TileServerConfig; import io.rudin.minetest.tileserver.query.YQueryBuilder; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.util.UnknownBlockCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,11 +47,11 @@ public class MapBlockRenderer { private final ColorTable colorTable; - public void render(Layer layer, int x, int z, Graphics graphics) throws IllegalArgumentException, DataFormatException, ExecutionException { - render(layer, x, z, graphics, 1); + public void render(int fromY, int toY, int x, int z, Graphics graphics) throws IllegalArgumentException, DataFormatException, ExecutionException { + render(fromY, toY, x, z, graphics, 1); } - public void render(Layer layer, int mapBlockX, int mapBlockZ, Graphics graphics, int scale) throws IllegalArgumentException, DataFormatException, ExecutionException { + public void render(int fromY, int toY, int mapBlockX, int mapBlockZ, Graphics graphics, int scale) throws IllegalArgumentException, DataFormatException, ExecutionException { logger.debug("Rendering block: x={} z={}", mapBlockX, mapBlockZ); @@ -66,9 +64,6 @@ public class MapBlockRenderer { boolean[][] xz_coords = new boolean[16][16]; - int fromY = YQueryBuilder.coordinateToMapBlock(layer.from); - int toY = YQueryBuilder.coordinateToMapBlock(layer.to); - mapBlockAccessor.prefetchTopDownYStride(mapBlockX, mapBlockZ, fromY, toY); for (int blocky = toY; blocky >= fromY; blocky--) { diff --git a/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java b/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java index d67db47..04e3278 100644 --- a/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java +++ b/src/main/java/io/rudin/minetest/tileserver/TileRenderer.java @@ -312,7 +312,7 @@ public class TileRenderer { long timingRender = 0; if (!countList.isEmpty()) { - blockRenderer.render(layer, mapblockX, mapblockZ, graphics, 16); + blockRenderer.render(layer.from, layer.to, mapblockX, mapblockZ, graphics, 16); now = System.currentTimeMillis(); timingRender = now - start; diff --git a/src/main/java/io/rudin/minetest/tileserver/accessor/Coordinate.java b/src/main/java/io/rudin/minetest/tileserver/accessor/Coordinate.java index 5b147ab..1846ab3 100644 --- a/src/main/java/io/rudin/minetest/tileserver/accessor/Coordinate.java +++ b/src/main/java/io/rudin/minetest/tileserver/accessor/Coordinate.java @@ -1,6 +1,6 @@ package io.rudin.minetest.tileserver.accessor; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.BlocksRecord; import java.util.Objects; diff --git a/src/main/java/io/rudin/minetest/tileserver/accessor/MapBlockAccessor.java b/src/main/java/io/rudin/minetest/tileserver/accessor/MapBlockAccessor.java index 670314c..e15c9a2 100644 --- a/src/main/java/io/rudin/minetest/tileserver/accessor/MapBlockAccessor.java +++ b/src/main/java/io/rudin/minetest/tileserver/accessor/MapBlockAccessor.java @@ -3,8 +3,8 @@ package io.rudin.minetest.tileserver.accessor; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import io.rudin.minetest.tileserver.MapBlock; -import io.rudin.minetest.tileserver.MapBlockParser; +import io.rudin.minetest.tileserver.util.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlockParser; import io.rudin.minetest.tileserver.blockdb.tables.records.BlocksRecord; import io.rudin.minetest.tileserver.config.TileServerConfig; import io.rudin.minetest.tileserver.service.BlocksRecordService; @@ -15,7 +15,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; import java.io.*; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/FancyVendBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/FancyVendBlockListener.java index ff0817c..d6fe555 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/FancyVendBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/FancyVendBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.ShopRecord; import io.rudin.minetest.tileserver.parser.Inventory; import io.rudin.minetest.tileserver.parser.Item; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/MissionBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/MissionBlockListener.java index 7d1cdd8..41320c0 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/MissionBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/MissionBlockListener.java @@ -1,9 +1,8 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.MissionsRecord; -import io.rudin.minetest.tileserver.blockdb.tables.records.TravelnetRecord; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.qualifier.MapDB; import io.rudin.minetest.tileserver.service.EventBus; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java index 5cb5279..c60ad22 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/PoiMapBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.PoiRecord; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.qualifier.MapDB; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/ProtectorMapBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/ProtectorMapBlockListener.java index 896b537..1ebb97d 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/ProtectorMapBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/ProtectorMapBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.ProtectorRecord; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.qualifier.MapDB; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/SmartShopBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/SmartShopBlockListener.java index 66f9b4a..067aa0b 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/SmartShopBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/SmartShopBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.ShopRecord; import io.rudin.minetest.tileserver.parser.Inventory; import io.rudin.minetest.tileserver.parser.Item; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/TrainBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/TrainBlockListener.java index fcc9d31..9f84670 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/TrainBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/TrainBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.TrainlineRecord; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.qualifier.MapDB; diff --git a/src/main/java/io/rudin/minetest/tileserver/listener/TravelNetBlockListener.java b/src/main/java/io/rudin/minetest/tileserver/listener/TravelNetBlockListener.java index 85508e8..4496ec2 100644 --- a/src/main/java/io/rudin/minetest/tileserver/listener/TravelNetBlockListener.java +++ b/src/main/java/io/rudin/minetest/tileserver/listener/TravelNetBlockListener.java @@ -1,7 +1,7 @@ package io.rudin.minetest.tileserver.listener; import com.google.common.eventbus.Subscribe; -import io.rudin.minetest.tileserver.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.blockdb.tables.records.TravelnetRecord; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.qualifier.MapDB; diff --git a/src/main/java/io/rudin/minetest/tileserver/parser/MetadataParser.java b/src/main/java/io/rudin/minetest/tileserver/parser/MetadataParser.java index b429f6e..00ecae2 100644 --- a/src/main/java/io/rudin/minetest/tileserver/parser/MetadataParser.java +++ b/src/main/java/io/rudin/minetest/tileserver/parser/MetadataParser.java @@ -1,7 +1,6 @@ package io.rudin.minetest.tileserver.parser; -import io.rudin.minetest.tileserver.MapBlockParser; -import org.jooq.Meta; +import io.rudin.minetest.tileserver.util.MapBlockParser; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/src/main/java/io/rudin/minetest/tileserver/service/EventBus.java b/src/main/java/io/rudin/minetest/tileserver/service/EventBus.java index 374ed9b..ac40522 100644 --- a/src/main/java/io/rudin/minetest/tileserver/service/EventBus.java +++ b/src/main/java/io/rudin/minetest/tileserver/service/EventBus.java @@ -1,12 +1,8 @@ package io.rudin.minetest.tileserver.service; -import io.rudin.minetest.tileserver.MapBlock; -import io.rudin.minetest.tileserver.blockdb.tables.pojos.Player; +import io.rudin.minetest.tileserver.util.MapBlock; import io.rudin.minetest.tileserver.entity.PlayerInfo; -import java.util.HashMap; -import java.util.Map; - public interface EventBus { void post(Object obj); diff --git a/src/main/java/io/rudin/minetest/tileserver/MapBlock.java b/src/main/java/io/rudin/minetest/tileserver/util/MapBlock.java similarity index 92% rename from src/main/java/io/rudin/minetest/tileserver/MapBlock.java rename to src/main/java/io/rudin/minetest/tileserver/util/MapBlock.java index 46c9a76..6d788a3 100644 --- a/src/main/java/io/rudin/minetest/tileserver/MapBlock.java +++ b/src/main/java/io/rudin/minetest/tileserver/util/MapBlock.java @@ -1,8 +1,8 @@ -package io.rudin.minetest.tileserver; +package io.rudin.minetest.tileserver.util; import io.rudin.minetest.tileserver.parser.Metadata; import io.rudin.minetest.tileserver.parser.MetadataParser; -import org.slf4j.Logger; +import io.rudin.minetest.tileserver.util.MapBlockParser; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/rudin/minetest/tileserver/MapBlockParser.java b/src/main/java/io/rudin/minetest/tileserver/util/MapBlockParser.java similarity index 98% rename from src/main/java/io/rudin/minetest/tileserver/MapBlockParser.java rename to src/main/java/io/rudin/minetest/tileserver/util/MapBlockParser.java index bc2730d..816046b 100644 --- a/src/main/java/io/rudin/minetest/tileserver/MapBlockParser.java +++ b/src/main/java/io/rudin/minetest/tileserver/util/MapBlockParser.java @@ -1,10 +1,9 @@ -package io.rudin.minetest.tileserver; +package io.rudin.minetest.tileserver.util; import io.rudin.minetest.tileserver.blockdb.tables.records.BlocksRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.FileOutputStream; import java.util.Map; import java.util.zip.DataFormatException; import java.util.zip.Inflater; diff --git a/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest.java b/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest.java index 4f944c8..be40fb9 100644 --- a/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest.java +++ b/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest.java @@ -5,6 +5,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.zip.DataFormatException; +import io.rudin.minetest.tileserver.util.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlockParser; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest2.java b/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest2.java index 17e130d..99531ef 100644 --- a/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest2.java +++ b/src/test/java/io/rudin/minetest/tileserver/MapBlockParserTest2.java @@ -1,11 +1,12 @@ package io.rudin.minetest.tileserver; import io.rudin.minetest.tileserver.parser.MetadataParser; +import io.rudin.minetest.tileserver.util.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlockParser; import org.junit.Before; import org.junit.Test; import java.io.*; -import java.util.zip.DataFormatException; public class MapBlockParserTest2 { diff --git a/src/test/java/io/rudin/minetest/tileserver/MapBlockPoiParserTest.java b/src/test/java/io/rudin/minetest/tileserver/MapBlockPoiParserTest.java index 53d2db8..7cc6bc8 100644 --- a/src/test/java/io/rudin/minetest/tileserver/MapBlockPoiParserTest.java +++ b/src/test/java/io/rudin/minetest/tileserver/MapBlockPoiParserTest.java @@ -1,5 +1,7 @@ package io.rudin.minetest.tileserver; +import io.rudin.minetest.tileserver.util.MapBlock; +import io.rudin.minetest.tileserver.util.MapBlockParser; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/io/rudin/minetest/tileserver/base/TileServerTest.java b/src/test/java/io/rudin/minetest/tileserver/base/TileServerTest.java index 3707350..1b836c3 100644 --- a/src/test/java/io/rudin/minetest/tileserver/base/TileServerTest.java +++ b/src/test/java/io/rudin/minetest/tileserver/base/TileServerTest.java @@ -41,6 +41,7 @@ public class TileServerTest { DataSource dataSource = injector.getInstance(Key.get(DataSource.class, MapDB.class)); try (Connection connection = dataSource.getConnection()){ + connection.createStatement().execute("drop all objects"); connection.createStatement().execute("runscript from 'classpath:/minetest-db.sql'"); }