diff --git a/dependencies.gradle b/dependencies.gradle index 675f9230..c213aa4e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -31,5 +31,6 @@ dependencies { // For CapturingTesselator compat compileOnly("com.falsepattern:falsetweaks-mc1.7.10:3.8.4:api") - compileOnly('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false } + compileOnly(rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')) { transitive = false } + compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2388751")) { transitive = false } } diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/GTNHLib.java b/src/main/java/com/gtnewhorizon/gtnhlib/GTNHLib.java index 113166cd..96a2a901 100644 --- a/src/main/java/com/gtnewhorizon/gtnhlib/GTNHLib.java +++ b/src/main/java/com/gtnewhorizon/gtnhlib/GTNHLib.java @@ -26,6 +26,7 @@ public class GTNHLib { public static CommonProxy proxy; public static boolean isMFRLoaded; + public static boolean isCoFHCoreLoaded; @Mod.EventHandler public void construct(FMLConstructionEvent event) { @@ -35,6 +36,7 @@ public class GTNHLib { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { isMFRLoaded = Loader.isModLoaded("MineFactoryReloaded"); + isCoFHCoreLoaded = Loader.isModLoaded("CoFHCore"); proxy.preInit(event); } diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/item/impl/ItemDuctSink.java b/src/main/java/com/gtnewhorizon/gtnhlib/item/impl/ItemDuctSink.java new file mode 100644 index 00000000..df28b512 --- /dev/null +++ b/src/main/java/com/gtnewhorizon/gtnhlib/item/impl/ItemDuctSink.java @@ -0,0 +1,40 @@ +package com.gtnewhorizon.gtnhlib.item.impl; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +import com.gtnewhorizon.gtnhlib.GTNHLib; +import com.gtnewhorizon.gtnhlib.capability.item.ItemSink; +import com.gtnewhorizon.gtnhlib.item.ImmutableItemStack; + +import cofh.api.transport.IItemDuct; + +public class ItemDuctSink implements ItemSink { + + public final IItemDuct itemDuct; + private final ForgeDirection side; + + public ItemDuctSink(IItemDuct itemDuct, ForgeDirection side) { + this.itemDuct = itemDuct; + this.side = side; + } + + @Override + public int store(ImmutableItemStack stack) { + ItemStack rejected = itemDuct.insertItem(side, stack.toStack()); + + if (rejected == null) return 0; + + if (!stack.matches(rejected)) { + GTNHLib.LOG.error( + "IItemDuct returned a rejected item that does not match what was inserted: deleting it to prevent dupes ({}x{})", + rejected.stackSize, + rejected.getDisplayName(), + new Exception()); + + return 0; + } + + return rejected.stackSize; + } +} diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/util/ItemUtil.java b/src/main/java/com/gtnewhorizon/gtnhlib/util/ItemUtil.java index 3a46b641..f86eab8a 100644 --- a/src/main/java/com/gtnewhorizon/gtnhlib/util/ItemUtil.java +++ b/src/main/java/com/gtnewhorizon/gtnhlib/util/ItemUtil.java @@ -21,10 +21,12 @@ import com.gtnewhorizon.gtnhlib.capability.item.ItemSource; import com.gtnewhorizon.gtnhlib.item.InventoryItemSink; import com.gtnewhorizon.gtnhlib.item.InventoryItemSource; import com.gtnewhorizon.gtnhlib.item.WrappedItemIO; +import com.gtnewhorizon.gtnhlib.item.impl.ItemDuctSink; import com.gtnewhorizon.gtnhlib.item.impl.mfr.DSUItemIO; import com.gtnewhorizon.gtnhlib.item.impl.mfr.DSUItemSink; import com.gtnewhorizon.gtnhlib.item.impl.mfr.DSUItemSource; +import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.Optional; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @@ -36,7 +38,9 @@ public class ItemUtil { public static final int FOR_EXTRACTS = 0b1 << counter++; /// Create [ItemSink]s / [ItemSource]s for [IDeepStorageUnit]s. public static final int WRAP_DSUS = 0b1 << counter++; - public static final int DEFAULT = WRAP_INVENTORIES | FOR_INSERTS | FOR_EXTRACTS | WRAP_DSUS; + /// Create [ItemSink]s for [IItemDuct]s. + public static final int WRAP_ITEM_DUCTS = 0b1 << counter++; + public static final int DEFAULT = WRAP_INVENTORIES | FOR_INSERTS | FOR_EXTRACTS | WRAP_DSUS | WRAP_ITEM_DUCTS; public static int getStackMeta(ItemStack stack) { return Items.feather.getDamage(stack); @@ -165,6 +169,12 @@ public class ItemUtil { if (sink != null) return sink; } + if ((usage & WRAP_ITEM_DUCTS) != 0 && GTNHLib.isCoFHCoreLoaded) { + ItemSink sink = getDuctSink(obj, side); + + if (sink != null) return sink; + } + return null; } @@ -232,4 +242,13 @@ public class ItemUtil { } } + @Optional.Method(modid = "CoFHCore") + private static ItemSink getDuctSink(Object obj, ForgeDirection side) { + if (obj instanceof IItemDuct duct) { + return new ItemDuctSink(duct, side); + } else { + return null; + } + } + }