Fix strange distance bug

Nico314159 · Aug 19, 2023 · 5403fa0 · 5403fa0
1 parent 749ed9c
commit 5403fa0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/data/retina/functions/storage/block.mcfunction b/data/retina/functions/storage/block.mcfunction
@@ -3,6 +3,8 @@ data modify storage retina:output TargetedBlock set value [0,0,0]
 data modify storage retina:output PlacingPosition set value [0,0,0]
 data modify storage retina:output ContactCoordinates set value [0.0d,0.0d,0.0d]
 data modify storage retina:output ContactSurface set from storage retina:data ContactSurface
+execute if score $X0 retina.__variable__ matches ..-1 run scoreboard players add $X0 retina.__variable__ 480
+execute if score $Y0 retina.__variable__ matches ..-1 run scoreboard players add $Y0 retina.__variable__ 480
 execute store result storage retina:output TargetedBlock[0] int 1 run scoreboard players get $int_X retina.__variable__
 execute store result storage retina:output PlacingPosition[0] int 1 run scoreboard players get $prev_X retina.__variable__
 scoreboard players operation $targeted_X retina.__variable__ += $origin_X retina.__variable__

diff --git a/data/retina/functions/storage/entity.mcfunction b/data/retina/functions/storage/entity.mcfunction
@@ -7,6 +7,8 @@ data modify storage retina:output TargetedEntity.Pos set from storage retina:dat
 data remove storage retina:data Entity
 data modify storage retina:output ContactSurface set from storage retina:data ContactSurface
 data modify storage retina:output ContactCoordinates set value [0.0d,0.0d,0.0d]
+execute if score $X0 retina.__variable__ matches ..-1 run scoreboard players add $X0 retina.__variable__ 480
+execute if score $Y0 retina.__variable__ matches ..-1 run scoreboard players add $Y0 retina.__variable__ 480
 scoreboard players operation $targeted_X retina.__variable__ += $origin_X retina.__variable__
 execute store result storage retina:output ContactCoordinates[0] double 0.0020833333333333333 run scoreboard players get $targeted_X retina.__variable__
 execute if score $nearest_axis retina.__variable__ matches 0 run function retina:__private__/if_else/20

diff --git a/retina.jmc b/retina.jmc
@@ -1897,6 +1897,10 @@ class storage {
         // Contact surface
         data modify storage retina:output ContactSurface set from storage retina:data ContactSurface;
 
+        // I have no clue why X and Y need this but Z doesn't.
+        if ($X0 < 0) $X0 += 480;
+        if ($Y0 < 0) $Y0 += 480;
+
         Hardcode.repeatLists(
             ["[axis]", "index"],
             () => {
@@ -1948,6 +1952,11 @@ class storage {
 
         // Contact coordinates
         data modify storage retina:output ContactCoordinates set value [0.0d, 0.0d, 0.0d];
+
+        // I have no clue why X and Y need this but Z doesn't.
+        if ($X0 < 0) $X0 += 480;
+        if ($Y0 < 0) $Y0 += 480;
+
         Hardcode.repeatLists(
             ["[axis]", "_index"],
             () => {