mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 05:02:18 +00:00
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:
1 parent
0a11ffb827
commit
8e43dfa7a6
20 files changed
+444
-294
No files matched your search
@@ -31,7 +31,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
@@ -212,7 +212,7 @@ public class VanillaInventoryCodeHooks
|
||||
return stack;
|
||||
}
|
||||
|
||||
private static OptionalCapabilityInstance<Pair<IItemHandler, Object>> getItemHandler(IHopper hopper, EnumFacing hopperFacing)
|
||||
private static LazyOptional<Pair<IItemHandler, Object>> getItemHandler(IHopper hopper, EnumFacing hopperFacing)
|
||||
{
|
||||
double x = hopper.getXPos() + (double) hopperFacing.getXOffset();
|
||||
double y = hopper.getYPos() + (double) hopperFacing.getYOffset();
|
||||
@@ -246,7 +246,7 @@ public class VanillaInventoryCodeHooks
|
||||
return true;
|
||||
}
|
||||
|
||||
public static OptionalCapabilityInstance<Pair<IItemHandler, Object>> getItemHandler(World worldIn, double x, double y, double z, final EnumFacing side)
|
||||
public static LazyOptional<Pair<IItemHandler, Object>> getItemHandler(World worldIn, double x, double y, double z, final EnumFacing side)
|
||||
{
|
||||
int i = MathHelper.floor(x);
|
||||
int j = MathHelper.floor(y);
|
||||
@@ -264,6 +264,6 @@ public class VanillaInventoryCodeHooks
|
||||
}
|
||||
}
|
||||
|
||||
return OptionalCapabilityInstance.empty();
|
||||
return LazyOptional.empty();
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user