fix registeriation

Author: zyxkad

src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c

@@ -1,6 +1,7 @@
-// 1.19.22024-05-28T14:53:16.655934Pocket Computer Upgrades
+// 1.19.22025-01-25T19:46:21.23515Pocket Computer Upgrades
 b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrades/chatty_pocket.json
 30b8f663613c7ce77048fd69631afcc11a682276 data/advancedperipherals/computercraft/pocket_upgrades/colony_pocket.json
+661dc77bd0442bfb2a5ed80cff271071817bb22d data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json
 d4647159c2f2693a9c5e8d12bf740635751d29a8 data/advancedperipherals/computercraft/pocket_upgrades/environment_pocket.json
 8216a0a7d8ebe3ae738c8fc3626df25eb0a2e07a data/advancedperipherals/computercraft/pocket_upgrades/geoscanner_pocket.json
 a38aa83593f7ad0ace98e01bb3b5f06f272ef734 data/advancedperipherals/computercraft/pocket_upgrades/player_pocket.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.19.2	2025-01-20T07:50:09.44057Languages: en_us
-ebf2194b8fece940adb61f1ae317f68799bd498f assets/advancedperipherals/lang/en_us.json
+// 1.19.2	2025-01-25T19:46:21.234203Languages: en_us
+e858500d72e9279f0fe0e8b2d03f94469c8d1f65 assets/advancedperipherals/lang/en_us.json

src/generated/resources/assets/advancedperipherals/lang/en_us.json

@@ -80,6 +80,7 @@
  "keybind.advancedperipherals.description": "Show Description",
  "pocket.advancedperipherals.chatty_pocket": "Chatty",
  "pocket.advancedperipherals.colony_pocket": "Colony",
+ "pocket.advancedperipherals.distance_pocket": "Distance Detector",
  "pocket.advancedperipherals.environment_pocket": "Environment",
  "pocket.advancedperipherals.geoscanner_pocket": "Geo",
  "pocket.advancedperipherals.player_pocket": "Player Detector",

src/generated/resources/data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json

@@ -0,0 +1,4 @@
+{
+ "type": "advancedperipherals:distance_pocket",
+ "item": "advancedperipherals:distance_detector"
+}

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/PocketPeripheralOwner.java

@@ -2,6 +2,7 @@
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.util.DataStorageUtil;
 import de.srendi.advancedperipherals.common.util.fakeplayer.APFakePlayer;
@@ -20,12 +21,15 @@
 
 public class PocketPeripheralOwner extends BasePeripheralOwner {
  private final IPocketAccess pocket;
+ private final IPocketUpgrade upgrade;
 
- public PocketPeripheralOwner(IPocketAccess pocket) {
+ public PocketPeripheralOwner(IPocketAccess pocket, IPocketUpgrade upgrade) {
  super();
  this.pocket = pocket;
- if(APConfig.PERIPHERALS_CONFIG.disablePocketFuelConsumption.get())
+ this.upgrade = upgrade;
+ if (APConfig.PERIPHERALS_CONFIG.disablePocketFuelConsumption.get()) {
  attachAbility(PeripheralOwnerAbility.FUEL, new InfinitePocketFuelAbility(this));
+ }
  }
 
  @Nullable
@@ -84,7 +88,7 @@ public Entity getHoldingEntity() {
  @NotNull
  @Override
  public CompoundTag getDataStorage() {
- return DataStorageUtil.getDataStorage(pocket);
+ return DataStorageUtil.getDataStorage(pocket, upgrade);
  }
 
  @Override

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

@@ -7,6 +7,7 @@
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
@@ -66,8 +67,8 @@ public ChatBoxPeripheral(ITurtleAccess turtle, TurtleSide side) {
  this(new TurtlePeripheralOwner(turtle, side));
  }
 
- public ChatBoxPeripheral(IPocketAccess pocket) {
- this(new PocketPeripheralOwner(pocket));
+ public ChatBoxPeripheral(IPocketAccess pocket, IPocketUpgrade upgrade) {
+ this(new PocketPeripheralOwner(pocket, upgrade));
  }
 
  @Override

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

@@ -18,6 +18,7 @@
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.IPeripheralOwner;
@@ -50,8 +51,8 @@ public ColonyPeripheral(PeripheralBlockEntity<?> tileEntity) {
  super(PERIPHERAL_TYPE, new BlockEntityPeripheralOwner<>(tileEntity));
  }
 
- public ColonyPeripheral(IPocketAccess access) {
- super(PERIPHERAL_TYPE, new PocketPeripheralOwner(access));
+ public ColonyPeripheral(IPocketAccess access, IPocketUpgrade upgrade) {
+ super(PERIPHERAL_TYPE, new PocketPeripheralOwner(access, upgrade));
  }
 
  @Override

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

@@ -3,12 +3,16 @@
 import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
+import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.BlockEntityPeripheralOwner;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.IPeripheralOwner;
+import de.srendi.advancedperipherals.common.addons.computercraft.owner.PocketPeripheralOwner;
 import de.srendi.advancedperipherals.common.blocks.blockentities.DistanceDetectorEntity;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.util.HitResultUtil;
 import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.HitResult;
@@ -41,6 +45,23 @@ 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;
+ CompoundTag data = this.owner.getDataStorage();
+ this.maxRange = new AtomicInteger(Float.floatToRawIntBits(data.contains("maxRange") ? data.getFloat("maxRange") : this.getConfiguredMaxRange()));
+ this.currentDistance = data.contains("currentDistance") ? data.getFloat("currentDistance") : -1;
+ this.showLaser = new AtomicBoolean(data.contains("showLaser") ? data.getBoolean("showLaser") : true);
+ this.calculatePeriodically = data.contains("calculatePeriodically") ? data.getBoolean("calculatePeriodically") : false;
+ this.ignoreTransparent = data.contains("ignoreTransparent") ? data.getBoolean("ignoreTransparent") : true;
+ this.detectionType = new AtomicReference<>(data.contains("detectionType") ? DetectionType.values()[data.getByte("detectionType")] : DetectionType.BOTH);
+ }
+
+ public DistanceDetectorPeripheral(IPocketAccess pocket, IPocketUpgrade upgrade) {
+ this(new PocketPeripheralOwner(pocket, upgrade));
+ }
+
  @Override
  public boolean isEnabled() {
  return APConfig.PERIPHERALS_CONFIG.enableDistanceDetector.get();
@@ -147,7 +168,7 @@ public final boolean getLaserVisibility() {
  return this.getShowLaser();
  }
 
- @LuaFunction
+ @LuaFunction(value = {"setIgnoreTransparency"})
  public final void setIgnoreTransparencyLua(boolean enable) {
  this.setIgnoreTransparent(enable);
  }
@@ -210,17 +231,17 @@ public final boolean shouldCalculatePeriodically() {
  return this.getCalculatePeriodically();
  }
 
- @LuaFunction
+ @LuaFunction(value = {"setCalculatePeriodically"})
  public final void setCalculatePeriodicallyLua(boolean shouldCalculatePeriodically) {
  this.setCalculatePeriodically(shouldCalculatePeriodically);
  }
 
- @LuaFunction
+ @LuaFunction(value = {"setMaxRange"})
  public final void setMaxRangeLua(double maxDistance) {
  this.setMaxRange((float) maxDistance);
  }
 
- @LuaFunction
+ @LuaFunction(value = {"getMaxRange"})
  public final double getMaxRangeLua() {
  return this.getMaxRange();
  }

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

@@ -5,6 +5,7 @@
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
 import de.srendi.advancedperipherals.common.addons.computercraft.operations.SphereOperationContext;
@@ -68,8 +69,8 @@ public EnvironmentDetectorPeripheral(ITurtleAccess turtle, TurtleSide side) {
  this(new TurtlePeripheralOwner(turtle, side).attachFuel(1));
  }
 
- public EnvironmentDetectorPeripheral(IPocketAccess pocket) {
- this(new PocketPeripheralOwner(pocket));
+ public EnvironmentDetectorPeripheral(IPocketAccess pocket, IPocketUpgrade upgrade) {
+ this(new PocketPeripheralOwner(pocket, upgrade));
  }
 
  private static int estimateCost(int radius) {

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

@@ -5,6 +5,7 @@
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.pocket.IPocketAccess;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
 import de.srendi.advancedperipherals.common.addons.computercraft.operations.SphereOperationContext;
@@ -57,8 +58,8 @@ public GeoScannerPeripheral(ITurtleAccess turtle, TurtleSide side) {
  this(new TurtlePeripheralOwner(turtle, side).attachFuel(1));
  }
 
- public GeoScannerPeripheral(IPocketAccess pocket) {
- this(new PocketPeripheralOwner(pocket));
+ public GeoScannerPeripheral(IPocketAccess pocket, IPocketUpgrade upgrade) {
+ this(new PocketPeripheralOwner(pocket, upgrade));
  }
 
  private static List<Map<String, Object>> scan(List<Map<String, Object>> result, Level level, Vec3 center, int radius) {