Skip to content

Commit 3d2df57

Browse files
committed
make dual interface use the same adpator like normal one
1 parent ea9ba2c commit 3d2df57

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") {transitive = false}
2020
compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.23-GTNH:dev') {transitive = false}
2121
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev') {transitive = false}
22+
compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") {transitive = false}
2223

2324
runtime("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
2425
}

src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static InventoryAdaptor wrap(TileEntity capProvider, EnumFacing face) {
3232
TileEntity inter = capProvider.getWorldObj().getTileEntity(capProvider.xCoord + f.offsetX, capProvider.yCoord + f.offsetY, capProvider.zCoord + f.offsetZ);
3333
if (!Config.noFluidPacket && !(inter instanceof TileFluidInterface || (inter instanceof TileCableBus && ((TileCableBus) inter).getPart(f.getOpposite()) instanceof PartFluidInterface)))
3434
return InventoryAdaptor.getAdaptor(capProvider, f);
35-
IInventory item = capProvider instanceof IInventory ? (IInventory) capProvider : null;
35+
InventoryAdaptor item = InventoryAdaptor.getAdaptor(capProvider, f);
3636
IFluidHandler fluid = capProvider instanceof IFluidHandler ? (IFluidHandler) capProvider : null;
3737
return new FluidConvertingInventoryAdaptor(item, fluid, face);
3838
}
@@ -41,8 +41,8 @@ public static InventoryAdaptor wrap(TileEntity capProvider, EnumFacing face) {
4141
private final IFluidHandler invFluids;
4242
private final ForgeDirection side;
4343

44-
public FluidConvertingInventoryAdaptor(@Nullable IInventory invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) {
45-
this.invItems = invItems != null ? InventoryAdaptor.getAdaptor(invItems, Util.from(facing)) : null;
44+
public FluidConvertingInventoryAdaptor(@Nullable InventoryAdaptor invItems, @Nullable IFluidHandler invFluids, EnumFacing facing) {
45+
this.invItems = invItems;
4646
this.invFluids = invFluids;
4747
this.side = Util.from(facing);
4848
}

0 commit comments

Comments
 (0)