Fix small drags not taking effect

Author: xpple

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -33,6 +33,7 @@
 import dev.xpple.seedmapper.thread.SeedMapExecutor;
 import dev.xpple.seedmapper.util.NativeAccess;
 import dev.xpple.seedmapper.util.QuartPos2;
+import dev.xpple.seedmapper.util.QuartPos2f;
 import dev.xpple.seedmapper.util.RegionPos;
 import dev.xpple.seedmapper.util.TwoDTree;
 import dev.xpple.seedmapper.util.WorldIdentifier;
@@ -224,7 +225,7 @@ private static int scaleToPixels(int quartOffset) {
 
     private final BlockPos playerPos;
 
-    private QuartPos2 centerQuart;
+    private QuartPos2f centerQuart;
 
     private int centerX;
     private int centerY;
@@ -323,8 +324,8 @@ public SeedMapScreen(long seed, int dimension, int version, BlockPos playerPos)
 
         this.playerPos = playerPos;
 
-        this.centerQuart = QuartPos2.fromBlockPos(playerPos);
-        this.mouseQuart = new QuartPos2(this.centerQuart.x(), this.centerQuart.z());
+        this.centerQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.playerPos));
+        this.mouseQuart = QuartPos2.fromQuartPos2f(this.centerQuart);
     }
 
     @Override
@@ -359,7 +360,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
         int horTileRadius = Math.ceilDiv(this.seedMapWidth, tileSizePixels) + 1;
         int verTileRadius = Math.ceilDiv(this.seedMapHeight, tileSizePixels) + 1;
 
-        TilePos centerTile = TilePos.fromQuartPos(this.centerQuart);
+        TilePos centerTile = TilePos.fromQuartPos(QuartPos2.fromQuartPos2f(this.centerQuart));
         for (int relTileX = -horTileRadius; relTileX <= horTileRadius; relTileX++) {
             for (int relTileZ = -verTileRadius; relTileZ <= verTileRadius; relTileZ++) {
                 TilePos tilePos = centerTile.add(relTileX, relTileZ);
@@ -397,7 +398,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
                     return;
                 }
                 int regionSize = StructureConfig.regionSize(structureConfig);
-                RegionPos centerRegion = RegionPos.fromQuartPos(this.centerQuart, regionSize);
+                RegionPos centerRegion = RegionPos.fromQuartPos(QuartPos2.fromQuartPos2f(this.centerQuart), regionSize);
                 int horRegionRadius = Math.ceilDiv(horChunkRadius, regionSize);
                 int verRegionRadius = Math.ceilDiv(verChunkRadius, regionSize);
                 StructureChecks.GenerationCheck generationCheck = StructureChecks.getGenerationCheck(structure);
@@ -493,8 +494,9 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
         }
 
         // draw player position
-        int playerMinX = this.centerX + scaleToPixels(QuartPos.fromBlock(this.playerPos.getX()) - this.centerQuart.x()) - 10;
-        int playerMinY = this.centerY + scaleToPixels(QuartPos.fromBlock(this.playerPos.getZ()) - this.centerQuart.z()) - 10;
+        QuartPos2f relPlayerQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.playerPos)).subtract(this.centerQuart);
+        int playerMinX = this.centerX + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.x()) - 10;
+        int playerMinY = this.centerY + Mth.floor(Configs.PixelsPerBiome * relPlayerQuart.z()) - 10;
         int playerMaxX = playerMinX + 20;
         int playerMaxY = playerMinY + 20;
         if (playerMinX >= HORIZONTAL_PADDING && playerMaxX <= HORIZONTAL_PADDING + this.seedMapWidth && playerMinY >= VERTICAL_PADDING && playerMaxY <= VERTICAL_PADDING + this.seedMapHeight) {
@@ -529,13 +531,12 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
 
     private void drawTile(GuiGraphics guiGraphics, Tile tile) {
         TilePos tilePos = tile.pos();
-        QuartPos2 relQuartPos = QuartPos2.fromTilePos(tilePos).subtract(this.centerQuart);
-        double pixelsPerQuart = Math.max(MIN_PIXELS_PER_BIOME, Configs.PixelsPerBiome);
-        double tileSizePixels = TilePos.TILE_SIZE_CHUNKS * (double) SCALED_CHUNK_SIZE * pixelsPerQuart;
-        double minXDouble = this.centerX + relQuartPos.x() * pixelsPerQuart;
-        double minYDouble = this.centerY + relQuartPos.z() * pixelsPerQuart;
-        double maxXDouble = minXDouble + tileSizePixels;
-        double maxYDouble = minYDouble + tileSizePixels;
+        QuartPos2f relTileQuart = QuartPos2f.fromQuartPos(QuartPos2.fromTilePos(tilePos)).subtract(this.centerQuart);
+        int tileSizePixels = TILE_SIZE_PIXELS.getAsInt();
+        int minX = this.centerX + Mth.floor(Configs.PixelsPerBiome * relTileQuart.x());
+        int minY = this.centerY + Mth.floor(Configs.PixelsPerBiome * relTileQuart.z());
+        int maxX = minX + tileSizePixels;
+        int maxY = minY + tileSizePixels;
 
         if (maxXDouble <= HORIZONTAL_PADDING || minXDouble >= HORIZONTAL_PADDING + this.seedMapWidth) {
             return;
@@ -1239,7 +1240,7 @@ private String getBiomeName(BlockPos pos) {
         return NativeAccess.readString(Cubiomes.biome2str(this.version, biome));
     }
 
-    private void moveCenter(QuartPos2 newCenter) {
+    private void moveCenter(QuartPos2f newCenter) {
         this.centerQuart = newCenter;
 
         this.featureWidgets.removeIf(widget -> {
@@ -1281,7 +1282,7 @@ private void handleMapMouseMoved(double mouseX, double mouseY) {
         int relXQuart = (int) ((mouseX - this.centerX) / Configs.PixelsPerBiome);
         int relZQuart = (int) ((mouseY - this.centerY) / Configs.PixelsPerBiome);
 
-        this.mouseQuart = this.centerQuart.add(relXQuart, relZQuart);
+        this.mouseQuart = QuartPos2.fromQuartPos2f(this.centerQuart.add(relXQuart, relZQuart));
     }
 
     @Override
@@ -1313,9 +1314,8 @@ public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double dragX, dou
             return false;
         }
 
-        // TODO: fix small drags not taking effect
-        int relXQuart = (int) (-dragX / Configs.PixelsPerBiome);
-        int relZQuart = (int) (-dragY / Configs.PixelsPerBiome);
+        float relXQuart = (float) (-dragX / Configs.PixelsPerBiome);
+        float relZQuart = (float) (-dragY / Configs.PixelsPerBiome);
 
         this.moveCenter(this.centerQuart.add(relXQuart, relZQuart));
         return true;
@@ -1531,7 +1531,7 @@ private boolean handleTeleportFieldEnter(KeyEvent keyEvent) {
         if (z < -Level.MAX_LEVEL_SIZE || z > Level.MAX_LEVEL_SIZE) {
             return false;
         }
-        this.moveCenter(new QuartPos2(QuartPos.fromBlock(x), QuartPos.fromBlock(z)));
+        this.moveCenter(new QuartPos2f(QuartPos.fromBlock(x), QuartPos.fromBlock(z)));
         this.teleportEditBoxX.setValue("");
         this.teleportEditBoxZ.setValue("");
         return true;
@@ -1623,8 +1623,9 @@ public FeatureWidget(MapFeature feature, BlockPos featureLocation) {
         }
 
         private void updatePosition() {
-            this.x = centerX + scaleToPixels(QuartPos.fromBlock(this.featureLocation.getX()) - centerQuart.x()) - this.feature.getTexture().width() / 2;
-            this.y = centerY + scaleToPixels(QuartPos.fromBlock(this.featureLocation.getZ()) - centerQuart.z()) - this.feature.getTexture().height() / 2;
+            QuartPos2f relFeatureQuart = QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(this.featureLocation)).subtract(centerQuart);
+            this.x = centerX + Mth.floor(Configs.PixelsPerBiome * relFeatureQuart.x()) - this.feature.getTexture().width() / 2;
+            this.y = centerY + Mth.floor(Configs.PixelsPerBiome * relFeatureQuart.z()) - this.feature.getTexture().height() / 2;
         }
 
         private int width() {

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapScreen.java

@@ -3,9 +3,14 @@
 import dev.xpple.seedmapper.seedmap.TilePos;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.QuartPos;
+import net.minecraft.util.Mth;
 import net.minecraft.world.level.ChunkPos;
 
 public record QuartPos2(int x, int z) {
+    public static QuartPos2 fromQuartPos2f(QuartPos2f quartPos2f) {
+        return new QuartPos2(Mth.floor(quartPos2f.x()), Mth.floor(quartPos2f.z()));
+    }
+
     public static QuartPos2 fromBlockPos(BlockPos blockPos) {
         return new QuartPos2(QuartPos.fromBlock(blockPos.getX()), QuartPos.fromBlock(blockPos.getZ()));
     }

src/main/java/dev/xpple/seedmapper/util/QuartPos2.java

@@ -0,0 +1,19 @@
+package dev.xpple.seedmapper.util;
+
+public record QuartPos2f(float x, float z) {
+    public static QuartPos2f fromQuartPos(QuartPos2 quartPos2) {
+        return new QuartPos2f(quartPos2.x(), quartPos2.z());
+    }
+
+    public QuartPos2f add(QuartPos2f quartPos) {
+        return this.add(quartPos.x, quartPos.z);
+    }
+
+    public QuartPos2f add(float quartX, float quartZ) {
+        return new QuartPos2f(this.x + quartX, this.z + quartZ);
+    }
+
+    public QuartPos2f subtract(QuartPos2f quartPos) {
+        return this.add(-quartPos.x, -quartPos.z);
+    }
+}