fix data storage for smartglass and save distance detector data in smartglass

Author: zyxkad

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/DistanceDetectorPeripheral.java

@@ -26,6 +26,7 @@ public class DistanceDetectorPeripheral extends BasePeripheral<IPeripheralOwner>
 
     public static final String PERIPHERAL_TYPE = "distance_detector";
 
+    private final AtomicBoolean isDirty = new AtomicBoolean(false);
     private final DistanceDetectorEntity tileEntity;
     private final AtomicInteger maxRange;
     private volatile float currentDistance;
@@ -37,6 +38,7 @@ public class DistanceDetectorPeripheral extends BasePeripheral<IPeripheralOwner>
     public DistanceDetectorPeripheral(DistanceDetectorEntity tileEntity) {
         super(PERIPHERAL_TYPE, new BlockEntityPeripheralOwner<>(tileEntity));
         this.tileEntity = tileEntity;
+        // TODO: let distance detector block also use data storage
         this.maxRange = new AtomicInteger(Float.floatToRawIntBits(this.tileEntity.getMaxRange()));
         this.currentDistance = this.tileEntity.getCurrentDistance();
         this.showLaser = new AtomicBoolean(this.tileEntity.getShowLaser());
@@ -45,7 +47,6 @@ public DistanceDetectorPeripheral(DistanceDetectorEntity tileEntity) {
         this.detectionType = new AtomicReference<>(this.tileEntity.getDetectionType());
     }
 
-    // TODO: thread safely save data
     protected DistanceDetectorPeripheral(IPeripheralOwner owner) {
         super(PERIPHERAL_TYPE, owner);
         this.tileEntity = null;
@@ -89,24 +90,20 @@ public void setMaxRange(float maxRange) {
             this.tileEntity.setMaxRange(maxRange);
             this.tileEntity.sendUpdate();
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     public float getCurrentDistance() {
         return this.currentDistance;
     }
 
     public void setCurrentDistance(float currentDistance) {
-        // Since setCurrentDistance should only invokes from main thread, volatile field should be safe here.
-        if (this.currentDistance == currentDistance) {
-            return;
-        }
         this.currentDistance = currentDistance;
         if (this.tileEntity != null) {
             this.tileEntity.setCurrentDistance(currentDistance);
             this.tileEntity.sendUpdate();
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     public boolean getCalculatePeriodically() {
@@ -118,7 +115,7 @@ public void setCalculatePeriodically(boolean calculatePeriodically) {
         if (this.tileEntity != null) {
             this.tileEntity.setCalculatePeriodically(calculatePeriodically);
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     public boolean getShowLaser() {
@@ -133,7 +130,7 @@ public void setShowLaser(boolean showLaser) {
             this.tileEntity.setShowLaser(showLaser);
             this.tileEntity.sendUpdate();
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     public boolean getIgnoreTransparent() {
@@ -145,7 +142,7 @@ public void setIgnoreTransparent(boolean ignoreTransparent) {
         if (this.tileEntity != null) {
             this.tileEntity.setIgnoreTransparent(ignoreTransparent);
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     public DetectionType getDetectionType() {
@@ -159,7 +156,7 @@ public void setDetectionType(DetectionType detectionType) {
         if (this.tileEntity != null) {
             this.tileEntity.setDetectionType(detectionType);
         }
-        this.owner.markDataStorageDirty();
+        this.isDirty.set(true);
     }
 
     @LuaFunction
@@ -286,6 +283,19 @@ public void update() {
             // It should be okay to run that function every 2 ticks, calculating it does not take too much time.
             this.calculateAndUpdateDistance();
         }
+
+        if (this.isDirty.getAndSet(false)) {
+            if (this.tileEntity == null) {
+                CompoundTag data = this.owner.getDataStorage();
+                data.putFloat("maxRange", this.getMaxRange());
+                data.putFloat("currentDistance", this.getCurrentDistance());
+                data.putBoolean("showLaser", this.getShowLaser());
+                data.putBoolean("calculatePeriodically", this.getCalculatePeriodically());
+                data.putBoolean("ignoreTransparent", this.getIgnoreTransparent());
+                data.putByte("detectionType", (byte) this.getDetectionType().ordinal());
+            }
+            this.owner.markDataStorageDirty();
+        }
     }
 
     protected HitResult getHitResult(Vec3 from, Vec3 to) {

src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesItem.java

@@ -248,7 +248,7 @@ public SmartGlassesComputer getOrCreateComputer(ServerLevel level, Entity entity
                 setComputerID(stack, computerID);
             }
 
-            computer = new SmartGlassesComputer(level, getComputerID(stack), getLabel(stack), getFamily(), stack.getOrCreateTag().getCompound(SmartGlassesComputer.UPGRADE_DATAS_TAG).copy());
+            computer = new SmartGlassesComputer(level, getComputerID(stack), getLabel(stack), getFamily(), stack.getOrCreateTag().getCompound(SmartGlassesComputer.UPGRADE_DATAS_TAG));
 
             setInstanceID(stack, computer.register());
             setSessionID(stack, registry.getSessionID());

src/main/java/de/srendi/advancedperipherals/common/smartglasses/SmartGlassesAccess.java

@@ -43,15 +43,17 @@ public void setLight(int colour) {
 
     @Override
     public CompoundTag getUpgradeNBTData() {
-        return new CompoundTag();
+        return computer.getUpgradeNBTData();
     }
 
     @Override
     public void updateUpgradeNBTData() {
+        computer.updateUpgradeNBTData();
     }
 
     @Override
     public void invalidatePeripheral() {
+        computer.invalidatePeripheral();
     }
 
     @Override

src/main/java/de/srendi/advancedperipherals/common/smartglasses/SmartGlassesComputer.java

@@ -212,18 +212,18 @@ private void updatePeripheralsAndModules(SmartGlassesItemHandler itemHandler) {
     public void tickServer() {
         super.tickServer();
 
+        boolean shouldUpdateInventory = this.peripheralOutdated || this.isDirty;
         if (this.peripheralOutdated && this.itemHandler != null) {
             this.peripheralOutdated = false;
             this.updatePeripheralsAndModules(this.itemHandler);
         }
-
         if (this.isDirty) {
             this.isDirty = false;
             CompoundTag data = this.stack.getOrCreateTag();
             data.put(UPGRADE_DATAS_TAG, this.upgradeDatas.copy());
-            if (entity instanceof Player player) {
-                player.getInventory().setChanged();
-            }
+        }
+        if (shouldUpdateInventory && entity instanceof Player player) {
+            player.getInventory().setChanged();
         }
 
         this.modules.values().forEach(module -> {