Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev

Author: IThundxr

.gitignore

@@ -29,6 +29,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+.factorypath
 
 # External tool builders
 .externalToolBuilders/

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

@@ -77,6 +77,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;
@@ -255,7 +256,8 @@ public enum AllPackets {
 	REDSTONE_REQUESTER_EFFECT(RedstoneRequesterEffectPacket.class, RedstoneRequesterEffectPacket::new, PLAY_TO_CLIENT),
 	KNOCKBACK(KnockbackPacket.class, KnockbackPacket::new, PLAY_TO_CLIENT),
 	TRAIN_MAP_SYNC(TrainMapSyncPacket.class, TrainMapSyncPacket::new, PLAY_TO_CLIENT),
-	CLIENTBOUND_CHAIN_CONVEYOR(ClientboundChainConveyorRidingPacket.class, ClientboundChainConveyorRidingPacket::new, PLAY_TO_CLIENT);
+	CLIENTBOUND_CHAIN_CONVEYOR(ClientboundChainConveyorRidingPacket.class, ClientboundChainConveyorRidingPacket::new, PLAY_TO_CLIENT),
+	SHOP_UPDATE(ShopUpdatePacket.class, ShopUpdatePacket::new, PLAY_TO_CLIENT);
 
 	static {
 		ClientboundSimpleActionPacket.addAction("rainbowDebug", () -> SimpleCreateActions::rainbowDebug);

src/main/java/com/simibubi/create/compat/computercraft/ComputerCraftProxy.java

@@ -16,6 +16,7 @@ public static void register() {
 	private static void registerWithDependency() {
 		/* Comment if computercraft.implementation is not in the source set */
 		 computerFactory = ComputerBehaviour::new;
+     ComputerBehaviour.registerItemDetailProviders();
 	}
 
 	private static Function<SmartBlockEntity, ? extends AbstractComputerBehaviour> fallbackFactory;

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

@@ -1,21 +1,41 @@
 package com.simibubi.create.compat.computercraft.implementation;
 
 import com.simibubi.create.compat.computercraft.AbstractComputerBehaviour;
+import com.simibubi.create.compat.computercraft.implementation.luaObjects.PackageLuaObject;
+import com.simibubi.create.compat.computercraft.implementation.luaObjects.PackageOrderLuaObject;
 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.box.PackageItem;
+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.PackageOrderWithCrafts;
+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;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.api.detail.VanillaDetailRegistries;
+import dan200.computercraft.api.lua.LuaException;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.common.capabilities.CapabilityToken;
@@ -41,19 +61,44 @@ public static NonNullSupplier<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);
+		// Has to be before PackagerBlockEntity as it's a subclass
+		if (be instanceof RepackagerBlockEntity rpbe)
+			return () -> new RepackagerPeripheral(rpbe);
+		if (be instanceof PackagerBlockEntity pgbe)
+			return () -> new PackagerPeripheral(pgbe);
+		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 " + ForgeRegistries.BLOCK_ENTITY_TYPES.getKey(be.getType()));
 	}
 
+  public static void registerItemDetailProviders() {
+    VanillaDetailRegistries.ITEM_STACK.addProvider((out, stack) -> {
+      if (PackageItem.isPackage(stack))
+      {
+        PackageLuaObject packageLuaObject = new PackageLuaObject(null, stack);
+        out.put("package", packageLuaObject);
+      }
+    });
+  }
+
 	@Override
 	public <T> boolean isPeripheralCap(Capability<T> cap) {
 		return cap == PERIPHERAL_CAPABILITY;