Computer Craft integration for Update 6 Logistics Blocks

src/main/java/com/simibubi/create/AllPackets.java

@@ -72,6 +72,7 @@
 import com.simibubi.create.content.logistics.stockTicker.StockKeeperCategoryHidingPacket;
 import com.simibubi.create.content.logistics.stockTicker.StockKeeperCategoryRefundPacket;
 import com.simibubi.create.content.logistics.stockTicker.StockKeeperLockPacket;
+import com.simibubi.create.content.logistics.tableCloth.ShopUpdatePacket;
 import com.simibubi.create.content.logistics.tunnel.TunnelFlapPacket;
 import com.simibubi.create.content.redstone.displayLink.DisplayLinkConfigurationPacket;
 import com.simibubi.create.content.redstone.link.controller.LinkedControllerBindPacket;
@@ -234,7 +235,8 @@ public enum AllPackets implements BasePacketPayload.PacketTypeProvider {
 	REDSTONE_REQUESTER_EFFECT(RedstoneRequesterEffectPacket.class, RedstoneRequesterEffectPacket.STREAM_CODEC),
 	KNOCKBACK(KnockbackPacket.class, KnockbackPacket.STREAM_CODEC),
 	TRAIN_MAP_SYNC(TrainMapSyncPacket.class, TrainMapSyncPacket.STREAM_CODEC),
-	CLIENTBOUND_CHAIN_CONVEYOR(ClientboundChainConveyorRidingPacket.class, ClientboundChainConveyorRidingPacket.STREAM_CODEC)
+	CLIENTBOUND_CHAIN_CONVEYOR(ClientboundChainConveyorRidingPacket.class, ClientboundChainConveyorRidingPacket.STREAM_CODEC),
+	SHOP_UPDATE(ShopUpdatePacket.class, ShopUpdatePacket.STREAM_CODEC)
 	;
 
 	static {

src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java

@@ -4,15 +4,29 @@
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.DisplayLinkPeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.FrogportPeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.PostboxPeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.RepackagerPeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.SequencedGearshiftPeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.SpeedControllerPeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.SpeedGaugePeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.StationPeripheral;
 import com.simibubi.create.compat.computercraft.implementation.peripherals.StressGaugePeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.StockTickerPeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.PackagerPeripheral;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.TableClothShopPeripheral;
+import com.simibubi.create.content.logistics.packagePort.frogport.FrogportBlockEntity;
+import com.simibubi.create.content.logistics.packagePort.postbox.PostboxBlockEntity;
+import com.simibubi.create.compat.computercraft.implementation.peripherals.RedstoneRequesterPeripheral;
+import com.simibubi.create.content.logistics.packager.repackager.RepackagerBlockEntity;
+import com.simibubi.create.content.logistics.redstoneRequester.RedstoneRequesterBlockEntity;
+import com.simibubi.create.content.logistics.packager.PackagerBlockEntity;
+import com.simibubi.create.content.logistics.stockTicker.StockTickerBlockEntity;
 import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity;
 import com.simibubi.create.content.kinetics.gauge.StressGaugeBlockEntity;
 import com.simibubi.create.content.kinetics.speedController.SpeedControllerBlockEntity;
 import com.simibubi.create.content.kinetics.transmission.sequencer.SequencedGearshiftBlockEntity;
+import com.simibubi.create.content.logistics.tableCloth.TableClothBlockEntity;
 import com.simibubi.create.content.redstone.displayLink.DisplayLinkBlockEntity;
 import com.simibubi.create.content.trains.station.StationBlockEntity;
 import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
@@ -37,14 +51,30 @@ public static Supplier<IPeripheral> getPeripheralFor(SmartBlockEntity be) {
 			return () -> new SpeedControllerPeripheral(scbe, scbe.targetSpeed);
 		if (be instanceof DisplayLinkBlockEntity dlbe)
 			return () -> new DisplayLinkPeripheral(dlbe);
+		if (be instanceof FrogportBlockEntity fpbe)
+			return () -> new FrogportPeripheral(fpbe);
+		if (be instanceof PostboxBlockEntity pbbe)
+			return () -> new PostboxPeripheral(pbbe);
 		if (be instanceof SequencedGearshiftBlockEntity sgbe)
 			return () -> new SequencedGearshiftPeripheral(sgbe);
 		if (be instanceof SpeedGaugeBlockEntity sgbe)
 			return () -> new SpeedGaugePeripheral(sgbe);
 		if (be instanceof StressGaugeBlockEntity sgbe)
 			return () -> new StressGaugePeripheral(sgbe);
+		if (be instanceof StockTickerBlockEntity sgbe)
+			return () -> new StockTickerPeripheral(sgbe);
+		if (be instanceof PackagerBlockEntity pgbe)
+			if (!(be instanceof RepackagerBlockEntity)){ // I really hate this, but I did not find any other way
+				return () -> new PackagerPeripheral(pgbe);
+			}
+		if (be instanceof RepackagerBlockEntity rpbe)
+			return () -> new RepackagerPeripheral(rpbe);
+		if (be instanceof RedstoneRequesterBlockEntity rrbe)
+			return () -> new RedstoneRequesterPeripheral(rrbe);
 		if (be instanceof StationBlockEntity sbe)
 			return () -> new StationPeripheral(sbe);
+		if (be instanceof TableClothBlockEntity tcbe)
+			return () -> new TableClothShopPeripheral(tcbe);
 
 		throw new IllegalArgumentException(
 			"No peripheral available for " + BuiltInRegistries.BLOCK_ENTITY_TYPE.getKey(be.getType()));

src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerUtil.java

@@ -0,0 +1,173 @@
+package com.simibubi.create.compat.computercraft.implementation;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.simibubi.create.content.logistics.BigItemStack;
+
+import dan200.computercraft.api.detail.VanillaDetailRegistries;
+import dan200.computercraft.api.lua.LuaException;
+
+import net.minecraft.world.item.ItemStack;
+
+import net.neoforged.neoforge.items.IItemHandler;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ComputerUtil {
+
+	// tldr: the computercraft api lets you parse items into lua-like-tables that cc
+	// uses for all it's items. to keep consistency with the rest of the inventory
+	// api in other parts of the mod i must do this terribleness. i am sorry.
+	public static int bigItemStackToLuaTableFilter(BigItemStack entry, Map<?, ?> filter) throws LuaException {
+		Map<String, Object> details = new HashMap<>(
+				VanillaDetailRegistries.ITEM_STACK.getDetails(entry.stack));
+		details.put("count", entry.count);
+		if (filter.containsKey("name"))
+			if (filter.get("name") instanceof String) {
+				String filterName = (String) filter.get("name");
+				if (!filterName.contains(":"))
+					filterName = "minecraft:" + filterName;
+				if (!filterName.equals(details.get("name")))
+					return 0;
+			} else {
+				throw new LuaException("Name must be a string");
+			}
+		// check the easy types
+		Map<String, Class<?>> expectedTypes = new HashMap<>();
+		expectedTypes.put("displayName", String.class);
+		expectedTypes.put("nbt", String.class);
+		expectedTypes.put("damage", Double.class);
+		expectedTypes.put("durability", Double.class);
+		expectedTypes.put("maxDamage", Double.class);
+		expectedTypes.put("maxCount", Double.class);
+		for (String key : expectedTypes.keySet()) {
+			if (filter.containsKey(key)) {
+				Object filterValue = filter.get(key);
+				Class<?> expectedType = expectedTypes.get(key);
+				if (expectedType.isInstance(filterValue)) {
+					Object detailsValue = details.get(key);
+					// some of these values are ints sometimes :tf:
+					if (expectedType == Double.class && detailsValue instanceof Number) {
+						detailsValue = ((Number) detailsValue).doubleValue();
+					}
+					if (!details.containsKey(key) || !filterValue.equals(detailsValue)) {
+						return 0;
+					}
+				} else {
+					throw new LuaException(key + " must be a " + expectedType.getSimpleName());
+				}
+			}
+		}
+		// java types dont mix well with lua tables at all
+		if (filter.containsKey("tags")) {
+			Object filterTagsObject = filter.get("tags");
+			Object itemTagsObject = details.get("tags");
+			if (filterTagsObject instanceof Map<?, ?> && itemTagsObject instanceof Map<?, ?>) {
+				@SuppressWarnings("unchecked")
+				Map<String, Boolean> filterTags = (Map<String, Boolean>) filterTagsObject;
+				@SuppressWarnings("unchecked")
+				Map<String, Boolean> itemTags = (Map<String, Boolean>) itemTagsObject;
+				for (Map.Entry<String, Boolean> filterTagEntry : filterTags.entrySet()) {
+					if (!(filterTagEntry.getValue() instanceof Boolean)) {
+						throw new LuaException(
+							"Tags filter must be a table of tags like: \n{tags = { \n	[\"minecraft:logs\"] = true} \n	{diamonds = true}\n}}");
+					}
+					int filterMatches = 0;
+					for (Map.Entry<String, Boolean> itemTagEntry : itemTags.entrySet()) {
+						if (itemTagEntry.getKey().equals(filterTagEntry.getKey())) {
+							filterMatches++;
+						}
+					}
+					if (filterMatches == 0) {
+						return 0;
+					}
+				}
+			} else {
+				return 0;
+			}
+		}
+		// avert your eyes, it only gets worse. When the computercraft api fetches
+		// enchants of an item, it's an array list. when you submit a table from within
+		// computercraft as an argument, it's always a hash map. Handling the mix of
+		// both instead of converting because i felt like it's a good idea
+		if (filter.containsKey("enchantments")) {
+			Object filterEnchantmentsObject = filter.get("enchantments"); // HashMap
+			Object itemEnchantmentsObject = details.get("enchantments"); // ArrayList
+			// i might be doing a major skill issue here, idk i mainly do development in lua
+			if (filterEnchantmentsObject instanceof Map<?, ?> && itemEnchantmentsObject instanceof ArrayList<?>) {
+				@SuppressWarnings("unchecked")
+				Map<String, Map<String, ?>> filterEnchantments = (Map<String, Map<String, ?>>) filterEnchantmentsObject;
+				@SuppressWarnings("unchecked")
+				ArrayList<HashMap<String, ?>> itemEnchantments = (ArrayList<HashMap<String, ?>>) itemEnchantmentsObject;
+				if (filterEnchantments.size() != itemEnchantments.size())
+					return 0;
+				Set<HashMap<String, ?>> matchedItemEnchantments = new HashSet<>();
+				for (Map.Entry<String, ?> filterEnchantmentNode : filterEnchantments.entrySet()) {
+					int filterMatches = 0;
+					if (!(filterEnchantmentNode.getValue() instanceof Map<?, ?>)) {
+						throw new LuaException(
+							"Enchantments filter must be a table of enchant information like: \n{enchantments = { \n	{name = \"minecraft:sharpness\"} \n	{name = \"minecraft:protection\" \n level = 1\n	}\n}}");
+					}
+					@SuppressWarnings("unchecked")
+					Map<String, ?> filterEnchantmentEntry = (Map<String, ?>) (filterEnchantmentNode.getValue());
+					String filterEnchantmentName = (String) (filterEnchantmentEntry.get("name"));
+					String filterEnchantmentDisplayName = (String) (filterEnchantmentEntry.get("displayName"));
+					Double filterEnchantmentLevel = 0.0;
+					boolean CheckEnchantmentName = false;
+					boolean CheckEnchantmentDisplayName = false;
+					boolean CheckEnchantmentLevel = false;
+					if (filterEnchantmentEntry.get("level") instanceof Double) {
+						filterEnchantmentLevel = (Double) (filterEnchantmentEntry.get("level"));
+						CheckEnchantmentLevel = true;
+					}
+					if (filterEnchantmentEntry.get("name") instanceof String) {
+						filterEnchantmentName = (String) (filterEnchantmentEntry.get("name"));
+						CheckEnchantmentName = true;
+					}
+					if (filterEnchantmentEntry.get("displayName") instanceof String) {
+						filterEnchantmentDisplayName = (String) (filterEnchantmentEntry.get("displayName"));
+						CheckEnchantmentDisplayName = true;
+					}
+					for (HashMap<String, ?> itemEnchantmentEntry : itemEnchantments) {
+						String itemEnchantmentName = (String) itemEnchantmentEntry.get("name");
+						String itemEnchantmentDisplayName = (String) (itemEnchantmentEntry.get("displayName"));
+						Integer itemEnchantmentLevel = (Integer) (itemEnchantmentEntry.get("level"));
+
+						if (!matchedItemEnchantments.contains(itemEnchantmentEntry)
+							&& (!CheckEnchantmentName || itemEnchantmentName.equals(filterEnchantmentName))
+							&& (!CheckEnchantmentDisplayName
+							|| (itemEnchantmentDisplayName.equals(filterEnchantmentDisplayName)))
+							&& (!CheckEnchantmentLevel
+							|| (itemEnchantmentLevel
+							.doubleValue()) == filterEnchantmentLevel)) {
+							matchedItemEnchantments.add(itemEnchantmentEntry); // one itemenchant per filter
+							filterMatches++;
+						}
+					}
+					if (filterMatches == 0) {
+						return 0;
+					}
+				}
+			} else {
+				return 0;
+			}
+		}
+		return entry.count;
+
+	}
+
+	public static Map<Integer, Map<String, ?>> list(IItemHandler inventory) {
+		Map<Integer, Map<String, ?>> result = new HashMap<>();
+		var size = inventory.getSlots();
+		for (var i = 0; i < size; i++) {
+			var stack = inventory.getStackInSlot(i);
+			if (!stack.isEmpty()) result.put(i + 1, VanillaDetailRegistries.ITEM_STACK.getBasicDetails(stack));
+		}
+
+		return result;
+	}
+}

src/main/java/com/simibubi/create/compat/computercraft/implementation/peripherals/FrogportPeripheral.java

@@ -0,0 +1,41 @@
+package com.simibubi.create.compat.computercraft.implementation.peripherals;
+
+import com.simibubi.create.content.logistics.packagePort.frogport.FrogportBlockEntity;
+
+import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.api.lua.LuaFunction;
+
+import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
+
+public class FrogportPeripheral extends SyncedPeripheral<FrogportBlockEntity> {
+
+	public FrogportPeripheral(FrogportBlockEntity blockEntity) {
+		super(blockEntity);
+	}
+
+	@LuaFunction(mainThread = true)
+	public final void setAddress(Optional<String> argument) throws LuaException {
+		if (argument.isPresent()) {
+			blockEntity.addressFilter = argument.get();
+			blockEntity.filterChanged();
+			blockEntity.notifyUpdate();
+		} else {
+			blockEntity.addressFilter = "";
+			blockEntity.filterChanged();
+			blockEntity.notifyUpdate();
+		}
+	}
+
+	@LuaFunction(mainThread = true)
+	public final String getAddress() throws LuaException {
+		return blockEntity.addressFilter;
+	}
+
+	@NotNull
+	@Override
+	public String getType() {
+		return "Create_Frogport";
+	}
+
+}