Refactor OptionalCapabilityInstance to LazyOptional; clean up

- Move to util package, rename to LazyOptional
- Clean up existing javadocs, add javadocs to everything missing them
- Add more NonNull functional interfaces, and use them everywhere
- Move orEmpty() to Capability, works better here anyways
This commit is contained in:
tterrag committed 2019-01-27 01:41:07 -05:00
1 parent 0a11ffb827
commit 8e43dfa7a6
20 files changed
+444 -294

No files matched your search

@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemHandlerHelper;
@@ -194,13 +194,13 @@ public abstract class EntityEquipmentInvWrapper implements IItemHandlerModifiabl
return slots.get(slot);
}
public static OptionalCapabilityInstance<IItemHandlerModifiable>[] create(EntityLivingBase entity)
public static LazyOptional<IItemHandlerModifiable>[] create(EntityLivingBase entity)
{
@SuppressWarnings("unchecked")
OptionalCapabilityInstance<IItemHandlerModifiable>[] ret = new OptionalCapabilityInstance[3];
ret[0] = OptionalCapabilityInstance.of(() -> new EntityHandsInvWrapper(entity));
ret[1] = OptionalCapabilityInstance.of(() -> new EntityArmorInvWrapper(entity));
ret[2] = OptionalCapabilityInstance.of(() -> new CombinedInvWrapper(ret[0].orElse(null), ret[1].orElse(null)));
LazyOptional<IItemHandlerModifiable>[] ret = new LazyOptional[3];
ret[0] = LazyOptional.of(() -> new EntityHandsInvWrapper(entity));
ret[1] = LazyOptional.of(() -> new EntityArmorInvWrapper(entity));
ret[2] = LazyOptional.of(() -> new CombinedInvWrapper(ret[0].orElse(null), ret[1].orElse(null)));
return ret;
}
}
@@ -22,7 +22,7 @@ package net.minecraftforge.items.wrapper;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemHandlerHelper;
@@ -34,11 +34,11 @@ public class SidedInvWrapper implements IItemHandlerModifiable
protected final EnumFacing side;
@SuppressWarnings("unchecked")
public static OptionalCapabilityInstance<IItemHandlerModifiable>[] create(ISidedInventory inv, EnumFacing... sides) {
OptionalCapabilityInstance<IItemHandlerModifiable>[] ret = new OptionalCapabilityInstance[sides.length];
public static LazyOptional<IItemHandlerModifiable>[] create(ISidedInventory inv, EnumFacing... sides) {
LazyOptional<IItemHandlerModifiable>[] ret = new LazyOptional[sides.length];
for (int x = 0; x < sides.length; x++) {
final EnumFacing side = sides[x];
ret[x] = OptionalCapabilityInstance.of(() -> new SidedInvWrapper(inv, side));
ret[x] = LazyOptional.of(() -> new SidedInvWrapper(inv, side));
}
return ret;
}