keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix using the wrong Pair implementation (#3449)

Browse source
This commit is contained in:
mezz 2016-11-24 20:15:32 -08:00 committed by LexManos
parent 969a75154f
commit c22382d12e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/minecraftforge/items/VanillaInventoryCodeHooks.java
View file

@ -19,7 +19,6 @@
package net.minecraftforge.items; package net.minecraftforge.items;
import javafx.util.Pair;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockDropper; import net.minecraft.block.BlockDropper;
import net.minecraft.block.BlockHopper; import net.minecraft.block.BlockHopper;
@ -32,6 +31,8 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -270,7 +271,7 @@ public class VanillaInventoryCodeHooks
if (tileentity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)) if (tileentity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side))
{ {
IItemHandler capability = tileentity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); IItemHandler capability = tileentity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
destination = new Pair<IItemHandler, Object>(capability, tileentity); destination = ImmutablePair.<IItemHandler, Object>of(capability, tileentity);
} }
} }
} }