mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 04:52:26 +00:00
Cleanup
This commit is contained in:
1 parent
92d62de486
commit
1b58077904
2 files changed
+11
-4
No files matched your search
@@ -19,10 +19,12 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.items.CapabilityItemHandler;
|
||||
import net.minecraftforge.items.IItemHandler;
|
||||
|
||||
import forestry.core.tiles.IFilterSlotDelegate;
|
||||
|
||||
public abstract class ItemInventory implements IInventory, IFilterSlotDelegate, ICapabilityProvider {
|
||||
@@ -30,6 +32,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate,
|
||||
private static final String KEY_UID = "UID";
|
||||
private static final Random rand = new Random();
|
||||
|
||||
private final IItemHandler capabilityHandler = new ItemHandlerItemInventory<>(this);
|
||||
private final EntityPlayer player;
|
||||
private final ItemStack parent;
|
||||
private final ItemStack[] inventoryStacks;
|
||||
@@ -292,12 +295,11 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate,
|
||||
public void setField(int id, int value) {
|
||||
}
|
||||
|
||||
IItemHandler handler = new ItemHandlerItemInventory(this);
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY){
|
||||
return (T) handler;
|
||||
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
|
||||
//noinspection unchecked
|
||||
return (T) capabilityHandler;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
******************************************************************************/
|
||||
package forestry.core.tiles;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.Random;
|
||||
@@ -28,10 +29,12 @@ import net.minecraft.util.IChatComponent;
|
||||
import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fml.common.Optional;
|
||||
import net.minecraftforge.items.CapabilityItemHandler;
|
||||
import net.minecraftforge.items.wrapper.SidedInvWrapper;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.core.IErrorLogicSource;
|
||||
import forestry.core.access.AccessHandler;
|
||||
@@ -62,6 +65,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE
|
||||
private final AccessHandler accessHandler = new AccessHandler(this);
|
||||
private final ErrorLogic errorHandler = new ErrorLogic();
|
||||
private final AdjacentTileCache tileCache = new AdjacentTileCache(this);
|
||||
@Nonnull
|
||||
private IInventoryAdapter inventory = FakeInventoryAdapter.instance();
|
||||
|
||||
private int tickCount = rand.nextInt(256);
|
||||
@@ -393,6 +397,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && inventory != null){
|
||||
//noinspection unchecked
|
||||
return (T) new SidedInvWrapper(inventory, facing);
|
||||
}
|
||||
return super.getCapability(capability, facing);
|
||||
|
||||
Reference in new issue
Block a user