APFakePlayer.Action instead of Function<APFakePlayer>

zyxkad · zyxkad · commit f80dd4cf8b0f · 2026-01-27T14:30:06.000-07:00
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/IPeripheralOwner.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/IPeripheralOwner.java
@@ -14,7 +14,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
-import java.util.function.Function;
 
 public interface IPeripheralOwner {
 
@@ -39,7 +38,7 @@ public interface IPeripheralOwner {
 
     void markDataStorageDirty();
 
-    <T> T withPlayer(Function<APFakePlayer, T> function);
+    <T> T withPlayer(APFakePlayer.Action<T> function);
 
     ItemStack getToolInMainHand();
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/PocketPeripheralOwner.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/PocketPeripheralOwner.java
@@ -18,8 +18,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.function.Function;
-
 public class PocketPeripheralOwner extends BasePeripheralOwner {
     private final IPocketAccess pocket;
 
@@ -98,7 +96,7 @@ public void markDataStorageDirty() {
     }
 
     @Override
-    public <T> T withPlayer(Function<APFakePlayer, T> function) {
+    public <T> T withPlayer(APFakePlayer.Action<T> function) {
         throw new RuntimeException("Not implemented yet");
     }
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/valkyrienskies/AutomataVSMountPlugin.java.disabled b/src/main/java/de/srendi/advancedperipherals/common/addons/valkyrienskies/AutomataVSMountPlugin.java.disabled
@@ -4,7 +4,7 @@ import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.lua.MethodResult;
-import de.srendi.advancedperipherals.common.addons.APAddons;
+import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.addons.computercraft.operations.SingleOperationContext;
 import de.srendi.advancedperipherals.common.addons.computercraft.owner.IPeripheralOwner;
 import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.plugins.AutomataCorePlugin;
@@ -33,7 +33,7 @@ public class AutomataVSMountPlugin extends AutomataCorePlugin {
     @LuaFunction(mainThread = true)
     public final boolean isOnShip() {
         IPeripheralOwner owner = this.automataCore.getPeripheralOwner();
-        return APAddons.isBlockOnShip(owner.getLevel(), owner.getPos());
+        return APAddon.isBlockOnShip(owner.getLevel(), owner.getPos());
     }
 
     @LuaFunction(mainThread = true)
diff --git a/src/main/java/de/srendi/advancedperipherals/common/blocks/base/PeripheralBlockEntity.java b/src/main/java/de/srendi/advancedperipherals/common/blocks/base/PeripheralBlockEntity.java
@@ -232,4 +232,12 @@ public CompoundTag getPeripheralSettings() {
     public void markSettingsChanged() {
         this.setChanged();
     }
+
+    public void sendUpdate() {
+        if (this.getLevel().isClientSide) {
+            return;
+        }
+        this.setChanged();
+        this.getLevel().sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), 0 /* no use on server-side */);
+    }
 }
diff --git a/src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java b/src/main/java/de/srendi/advancedperipherals/common/data/RecipesProvider.java
@@ -9,6 +9,7 @@
 import com.refinedmods.refinedstorage.RSItems;
 import com.refinedmods.refinedstorage.common.misc.ProcessorItem;
 import dan200.computercraft.shared.ModRegistry;
+import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.setup.APBlocks;
 import de.srendi.advancedperipherals.common.setup.APItems;
diff --git a/src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesInterfaceItem.java b/src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesInterfaceItem.java
@@ -2,7 +2,7 @@
 
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import de.srendi.advancedperipherals.AdvancedPeripherals;
-import de.srendi.advancedperipherals.common.addons.APAddons;
+import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.items.base.BaseItem;
 import de.srendi.advancedperipherals.common.setup.APTags;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
@@ -38,8 +38,8 @@ public InteractionResultHolder<ItemStack> use(@NotNull Level world, @NotNull Pla
         // curio slot or on the head
         ItemStack findGlasses = player.getItemBySlot(EquipmentSlot.HEAD);
         if (!findGlasses.is(APTags.Items.SMART_GLASSES))
-            if (APAddons.curiosLoaded)
-                findGlasses = APAddons.getCurioGlasses(player);
+            if (APAddon.curiosLoaded)
+                findGlasses = APAddon.getCurioGlasses(player);
 
         if (!findGlasses.is(APTags.Items.SMART_GLASSES)) {
             player.displayClientMessage(Component.translatable("item.advancedperipherals.smartglasses.dontwear"), false);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesItem.java b/src/main/java/de/srendi/advancedperipherals/common/items/SmartGlassesItem.java
@@ -3,7 +3,7 @@
 import com.google.common.base.Objects;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.filesystem.WritableMount;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
@@ -34,6 +34,7 @@
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ArmorItem;
@@ -306,7 +307,7 @@ public boolean setLabel(ItemStack stack, @Nullable String label) {
 
     @Nullable
     @Override
-    public IWritableMount createDataMount(@NotNull ItemStack stack, @NotNull Level level) {
+    public WritableMount createDataMount(@NotNull ItemStack stack, @NotNull Level level) {
         int id = getComputerID(stack);
         if (id >= 0) {
             return ComputerCraftAPI.createSaveDirMount(level, "computer/" + id, ComputerCraft.computerSpaceLimit);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toclient/KeyboardMouseCapturePacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toclient/KeyboardMouseCapturePacket.java
@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.network.toclient;
 
+import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.client.screens.KeyboardScreen;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseClickPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseClickPacket.java
@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.network.toserver;
 
+import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
@@ -28,7 +29,7 @@ public KeyboardMouseClickPacket(FriendlyByteBuf buffer) {
 
     @Override
     public void handle(IPayloadContext context) {
-        if (context.player() instanceof ServerPlayer player) {
+        if (!(context.player() instanceof ServerPlayer player)) {
             return;
         }
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseMovePacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseMovePacket.java
@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.network.toserver;
 
+import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
@@ -28,7 +29,7 @@ public KeyboardMouseMovePacket(FriendlyByteBuf buffer) {
 
     @Override
     public void handle(IPayloadContext context) {
-        if (context.player() instanceof ServerPlayer player) {
+        if (!(context.player() instanceof ServerPlayer player)) {
             return;
         }
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseScrollPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/KeyboardMouseScrollPacket.java
@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.network.toserver;
 
+import de.srendi.advancedperipherals.AdvancedPeripherals;
 import de.srendi.advancedperipherals.common.items.SmartGlassesItem;
 import de.srendi.advancedperipherals.common.network.IAPPacket;
 import de.srendi.advancedperipherals.common.smartglasses.SmartGlassesComputer;
@@ -27,7 +28,7 @@ public KeyboardMouseScrollPacket(FriendlyByteBuf buffer) {
 
     @Override
     public void handle(IPayloadContext context) {
-        if (context.player() instanceof ServerPlayer player) {
+        if (!(context.player() instanceof ServerPlayer player)) {
             return;
         }
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/network/toserver/OverlayModuleClientInfoPacket.java b/src/main/java/de/srendi/advancedperipherals/common/network/toserver/OverlayModuleClientInfoPacket.java
@@ -39,7 +39,7 @@ public OverlayModuleClientInfoPacket(RegistryFriendlyByteBuf buffer) {
 
     @Override
     public void handle(IPayloadContext context) {
-        if (context.player() instanceof ServerPlayer player) {
+        if (!(context.player() instanceof ServerPlayer player)) {
             return;
         }
 
diff --git a/src/main/java/de/srendi/advancedperipherals/common/setup/APItems.java b/src/main/java/de/srendi/advancedperipherals/common/setup/APItems.java
@@ -1,6 +1,6 @@
 package de.srendi.advancedperipherals.common.setup;
 
-import de.srendi.advancedperipherals.common.addons.APAddons;
+import de.srendi.advancedperipherals.common.addons.APAddon;
 import de.srendi.advancedperipherals.common.addons.ae2.AE2Registries;
 import de.srendi.advancedperipherals.common.configuration.APConfig;
 import de.srendi.advancedperipherals.common.items.APItem;
@@ -18,7 +18,7 @@
 
 public class APItems {
 
-    public static final DeferredHolder<Item, APItem> CABLE_P2P_TUNNEL = APAddons.appliedEnergisticsLoaded ? (DeferredHolder<Item, APItem>) (DeferredHolder<Item, ?>) AE2Registries.CABLE_P2P_TUNNEL : null;
+    public static final DeferredHolder<Item, APItem> CABLE_P2P_TUNNEL = APAddon.appliedEnergisticsLoaded ? (DeferredHolder<Item, APItem>) (DeferredHolder<Item, ?>) AE2Registries.CABLE_P2P_TUNNEL : null;
     public static final DeferredHolder<Item, APItem> CHUNK_CONTROLLER = APRegistration.ITEMS.register("chunk_controller", () -> new APItem(new Item.Properties().stacksTo(16), APConfig.PERIPHERALS_CONFIG.enableChunkyTurtle));
     public static final DeferredHolder<Item, APItem> COMPUTER_TOOL = APRegistration.ITEMS.register("computer_tool", () -> new APItem(new Item.Properties().stacksTo(1), () -> true));
     public static final DeferredHolder<Item, APItem> END_AUTOMATA_CORE = APRegistration.ITEMS.register("end_automata_core", () -> new APItem(new Item.Properties().stacksTo(1), APConfig.METAPHYSICS_CONFIG.enableEndAutomataCore));
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/FakePlayerProviderTurtle.java b/src/main/java/de/srendi/advancedperipherals/common/util/fakeplayer/FakePlayerProviderTurtle.java
@@ -15,7 +15,6 @@
 import net.minecraft.world.item.ItemStack;
 
 import java.util.WeakHashMap;
-import java.util.function.Function;
 
 public final class FakePlayerProviderTurtle {
 
@@ -105,7 +104,7 @@ public static void unload(APFakePlayer player, ITurtleAccess turtle) {
     }
 
 
-    public static <T> T withPlayer(ITurtleAccess turtle, Function<APFakePlayer, T> function) {
+    public static <T> T withPlayer(ITurtleAccess turtle, APFakePlayer.Action<T> function) {
         APFakePlayer player = getPlayer(turtle, turtle.getOwningPlayer());
         load(player, turtle);
         T result = function.apply(player);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/inventory/ChemicalFilter.java b/src/main/java/de/srendi/advancedperipherals/common/util/inventory/ChemicalFilter.java
@@ -54,11 +54,8 @@ public static Pair<ChemicalFilter, String> parse(LuaTable<?, ?> item) throws Lua
         if (item.containsKey("toSlot")) {
             chemicalFilter.toSlot = item.getInt("toSlot");
         }
-        // TODO: rename count to amount in 0.8
         if (item.containsKey("amount")) {
             chemicalFilter.amount = item.getLong("amount");
-        } else if (item.containsKey("count")) {
-            chemicalFilter.amount = item.getLong("count");
         }
 
         AdvancedPeripherals.debug("Parsed item filter: " + chemicalFilter);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/inventory/FluidFilter.java b/src/main/java/de/srendi/advancedperipherals/common/util/inventory/FluidFilter.java
@@ -69,11 +69,8 @@ public static Pair<FluidFilter, String> parse(LuaTable<?, ?> item) throws LuaExc
         if (item.containsKey("fingerprint")) {
             fluidFilter.fingerprint = item.getString("fingerprint");
         }
-        // TODO: rename count to amount in 0.8
         if (item.containsKey("amount")) {
             fluidFilter.amount = item.getInt("amount");
-        } else if (item.containsKey("count")) {
-            fluidFilter.amount = item.getInt("count");
         }
         AdvancedPeripherals.debug("Parsed fluid filter: " + fluidFilter);
 

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`import org.jetbrains.annotations.NotNull;`
`19`	`19`	`import org.jetbrains.annotations.Nullable;`
`20`	`20`
`21`		`-import java.util.function.Function;`
`22`		`-`
`23`	`21`	`public class PocketPeripheralOwner extends BasePeripheralOwner {`
`24`	`22`	`private final IPocketAccess pocket;`
`25`	`23`
`@@ -98,7 +96,7 @@ public void markDataStorageDirty() {`
`98`	`96`	`}`
`99`	`97`
`100`	`98`	`@Override`
`101`		`- public <T> T withPlayer(Function<APFakePlayer, T> function) {`
	`99`	`+ public <T> T withPlayer(APFakePlayer.Action<T> function) {`
`102`	`100`	`throw new RuntimeException("Not implemented yet");`
`103`	`101`	`}`
`104`	`102`
Original file line number	Diff line number	Diff line change
`@@ -232,4 +232,12 @@ public CompoundTag getPeripheralSettings() {`
`232`	`232`	`public void markSettingsChanged() {`
`233`	`233`	`this.setChanged();`
`234`	`234`	`}`
	`235`	`+`
	`236`	`+ public void sendUpdate() {`
	`237`	`+ if (this.getLevel().isClientSide) {`
	`238`	`+ return;`
	`239`	`+ }`
	`240`	`+ this.setChanged();`
	`241`	`+ this.getLevel().sendBlockUpdated(this.getBlockPos(), this.getBlockState(), this.getBlockState(), 0 /* no use on server-side */);`
	`242`	`+ }`
`235`	`243`	`}`