mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-24 16:07:01 +00:00
Code Issues Releases Wiki Activity

Fallback to the current side when getting item cap

Browse Source 
Fixes #1764
This commit is contained in:
Jonathan Coates 2024-03-25 08:59:08 +00:00
parent ad0f551204
commit 9af1aa1ecf
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java
View File

@ -8,7 +8,9 @@ import dan200.computercraft.api.detail.VanillaDetailRegistries;
import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.api.lua.LuaFunction; import dan200.computercraft.api.lua.LuaFunction;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.shared.platform.ForgeContainerTransfer; import dan200.computercraft.shared.platform.ForgeContainerTransfer;
import dan200.computercraft.shared.util.CapabilityUtil;
import net.minecraft.world.Container; import net.minecraft.world.Container;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.capabilities.ForgeCapabilities;
@ -73,7 +75,7 @@ public final class InventoryMethods extends AbstractInventoryMethods<IItemHandle
var location = computer.getAvailablePeripheral(toName); var location = computer.getAvailablePeripheral(toName);
if (location == null) throw new LuaException("Target '" + toName + "' does not exist"); if (location == null) throw new LuaException("Target '" + toName + "' does not exist");
var to = extractHandler(location.getTarget()); var to = extractHandler(location);
if (to == null) throw new LuaException("Target '" + toName + "' is not an inventory"); if (to == null) throw new LuaException("Target '" + toName + "' is not an inventory");
// Validate slots // Validate slots
@ -95,7 +97,7 @@ public final class InventoryMethods extends AbstractInventoryMethods<IItemHandle
var location = computer.getAvailablePeripheral(fromName); var location = computer.getAvailablePeripheral(fromName);
if (location == null) throw new LuaException("Source '" + fromName + "' does not exist"); if (location == null) throw new LuaException("Source '" + fromName + "' does not exist");
var from = extractHandler(location.getTarget()); var from = extractHandler(location);
if (from == null) throw new LuaException("Source '" + fromName + "' is not an inventory"); if (from == null) throw new LuaException("Source '" + fromName + "' is not an inventory");
// Validate slots // Validate slots
@ -108,11 +110,14 @@ public final class InventoryMethods extends AbstractInventoryMethods<IItemHandle
} }
@Nullable @Nullable
private static IItemHandler extractHandler(@Nullable Object object) { private static IItemHandler extractHandler(IPeripheral peripheral) {
var object = peripheral.getTarget();
var direction = peripheral instanceof dan200.computercraft.shared.peripheral.generic.GenericPeripheral sided ? sided.side() : null;
if (object instanceof BlockEntity blockEntity && blockEntity.isRemoved()) return null; if (object instanceof BlockEntity blockEntity && blockEntity.isRemoved()) return null;
if (object instanceof ICapabilityProvider provider) { if (object instanceof ICapabilityProvider provider) {
var cap = provider.getCapability(ForgeCapabilities.ITEM_HANDLER); var cap = CapabilityUtil.getCapability(provider, ForgeCapabilities.ITEM_HANDLER, direction);
if (cap.isPresent()) return cap.orElseThrow(NullPointerException::new); if (cap.isPresent()) return cap.orElseThrow(NullPointerException::new);
} }

4
projects/forge/src/main/java/dan200/computercraft/shared/util/CapabilityUtil.java
View File

@ -50,8 +50,8 @@ public final class CapabilityUtil {
* @param <T> The type of the underlying capability. * @param <T> The type of the underlying capability.
* @return The extracted capability, if present. * @return The extracted capability, if present.
*/ */
public static <T> LazyOptional<T> getCapability(ICapabilityProvider provider, Capability<T> capability, Direction side) { public static <T> LazyOptional<T> getCapability(ICapabilityProvider provider, Capability<T> capability, @Nullable Direction side) {
var cap = provider.getCapability(capability); var cap = provider.getCapability(capability);
return cap.isPresent() ? cap : provider.getCapability(capability, side); return !cap.isPresent() && side != null ? provider.getCapability(capability, side) : cap;
} }
} }