mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
This commit is contained in:
commit
0cb18773aa
1288 files changed
+11316
-7212
No files matched your search
@@ -19,6 +19,7 @@ import mekanism.common.block.states.BlockStateMachine;
|
||||
import mekanism.common.inventory.InventoryBin;
|
||||
import mekanism.common.recipe.ShapedMekanismRecipe;
|
||||
import mekanism.common.recipe.ShapelessMekanismRecipe;
|
||||
import mekanism.common.security.ISecurityItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.inventory.InventoryCrafting;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -151,6 +152,22 @@ public class RecipeUtils
|
||||
}
|
||||
}
|
||||
|
||||
if(toReturn.getItem() instanceof ISecurityItem)
|
||||
{
|
||||
for(int i = 0; i < 9; i++)
|
||||
{
|
||||
ItemStack itemstack = inv.getStackInSlot(i);
|
||||
|
||||
if(itemstack.getItem() instanceof ISecurityItem)
|
||||
{
|
||||
((ISecurityItem)toReturn.getItem()).setOwner(toReturn, ((ISecurityItem)itemstack.getItem()).getOwner(itemstack));
|
||||
((ISecurityItem)toReturn.getItem()).setSecurity(toReturn, ((ISecurityItem)itemstack.getItem()).getSecurity(itemstack));
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(toReturn.getItem() instanceof IFluidContainerItem)
|
||||
{
|
||||
FluidStack fluidFound = null;
|
||||
|
||||
Reference in new issue
Block a user