lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an interaction issue between vanilla hoppers and the Alchemy Table, due to the hoppers not actually using the Forge capabilities for all of its checking methods.

Browse source
This commit is contained in:
WayofTime 2018-04-13 16:44:00 -04:00
parent 2db0ce5639
commit af3e1fecb6
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java
View file

@ -8,13 +8,13 @@ import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityHopper;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.wrapper.SidedInvWrapper;
import WayofTime.bloodmagic.api.impl.BloodMagicAPI;
import WayofTime.bloodmagic.api.impl.recipe.RecipeAlchemyTable;
import WayofTime.bloodmagic.core.data.Binding;
@ -121,13 +121,13 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
if (this.isSlave())
{
TileEntity tile = getWorld().getTileEntity(connectedPos);
if (tile instanceof TileAlchemyTable)
if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave)
{
return (T) new SidedInvWrapper((TileAlchemyTable) tile, facing);
return (T) tile.getCapability(capability, facing);
}
} else
{
return (T) new SidedInvWrapper(this, facing);
return super.getCapability(capability, facing);
}
}
@ -167,6 +167,14 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
return true;
}
default:
if (this.isSlave)
{
TileEntity tile = getWorld().getTileEntity(connectedPos);
if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave)
{
return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction);
}
}
return getAccessibleInputSlots(direction).contains(index);
}
}
@ -190,6 +198,14 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory,
return true;
}
default:
if (this.isSlave)
{
TileEntity tile = getWorld().getTileEntity(connectedPos);
if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave)
{
return ((TileAlchemyTable) tile).canExtractItem(index, stack, direction);
}
}
return getAccessibleInputSlots(direction).contains(index);
}
}