Skip to content

Commit 517cfe8

Browse files
committed
Fix transfer API compat introducing transfer api dependency
1 parent 671ac79 commit 517cfe8

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

fabric/src/main/java/net/caffeinemc/mods/lithium/fabric/FabricMixinOverrides.java

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ public void applyLithiumCompat(Map<String, Option> options) {
1919
if (FabricLoader.getInstance().isModLoaded("worldedit")) {
2020
options.get("mixin.compat.worldedit").addModOverride(true, "lithium");
2121
}
22-
if (FabricLoader.getInstance().isModLoaded("fabric-transfer-api-v1")) {
23-
options.get("mixin.compat.transfer_api").addModOverride(true, "lithium");
24-
}
2522
}
2623

2724
@Override

fabric/src/main/java/net/caffeinemc/mods/lithium/fabric/FabricModCompat.java

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.caffeinemc.mods.lithium.common.services.PlatformModCompat;
44
import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage;
5+
import net.fabricmc.loader.api.FabricLoader;
56
import net.minecraft.core.BlockPos;
67
import net.minecraft.core.Direction;
78
import net.minecraft.world.level.block.HopperBlock;
@@ -10,8 +11,17 @@
1011

1112
public class FabricModCompat implements PlatformModCompat {
1213

14+
private static final boolean HAS_TRANSFER_API = FabricLoader.getInstance().isModLoaded("fabric-transfer-api-v1");
15+
1316
@Override
1417
public boolean canHopperInteractWithApiBlockInventory(HopperBlockEntity hopperBlockEntity, BlockState hopperState, boolean extracting) {
18+
if (!HAS_TRANSFER_API) {
19+
return false;
20+
}
21+
return canFindApiInventory(hopperBlockEntity, hopperState, extracting);
22+
}
23+
24+
private static boolean canFindApiInventory(HopperBlockEntity hopperBlockEntity, BlockState hopperState, boolean extracting) {
1525
Direction direction = extracting ? Direction.UP : hopperState.getValue(HopperBlock.FACING);
1626
BlockPos targetPos = hopperBlockEntity.getBlockPos().relative(direction);
1727

0 commit comments

Comments
 (0)