ENERGY = ForgeCapabilities.ENERGY;
+ public static void register(RegisterCapabilitiesEvent event){}
}
diff --git a/src/main/java/net/minecraftforge/energy/IEnergyStorage.java b/src/main/java/net/minecraftforge/energy/IEnergyStorage.java
index 2a17ec36f8..7eedbcb15d 100644
--- a/src/main/java/net/minecraftforge/energy/IEnergyStorage.java
+++ b/src/main/java/net/minecraftforge/energy/IEnergyStorage.java
@@ -5,6 +5,8 @@
package net.minecraftforge.energy;
+import net.minecraftforge.common.capabilities.AutoRegisterCapability;
+
/**
* An energy storage is the unit of interaction with Energy inventories.
*
@@ -14,6 +16,7 @@ package net.minecraftforge.energy;
* Created with consent and permission of King Lemming and Team CoFH. Released with permission under LGPL 2.1 when bundled with Forge.
*
*/
+@AutoRegisterCapability
public interface IEnergyStorage
{
/**
diff --git a/src/main/java/net/minecraftforge/fluids/FluidUtil.java b/src/main/java/net/minecraftforge/fluids/FluidUtil.java
index 5f63ae3fd9..7784443672 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidUtil.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidUtil.java
@@ -24,14 +24,13 @@ import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.SoundActions;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import net.minecraftforge.fluids.capability.wrappers.BlockWrapper;
import net.minecraftforge.fluids.capability.wrappers.BucketPickupHandlerWrapper;
import net.minecraftforge.fluids.capability.wrappers.FluidBlockWrapper;
-import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
@@ -91,7 +90,7 @@ public class FluidUtil
ItemStack heldItem = player.getItemInHand(hand);
if (!heldItem.isEmpty())
{
- return player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+ return player.getCapability(ForgeCapabilities.ITEM_HANDLER)
.map(playerInventory -> {
FluidActionResult fluidActionResult = tryFillContainerAndStow(heldItem, handler, playerInventory, Integer.MAX_VALUE, player, true);
@@ -418,7 +417,7 @@ public class FluidUtil
*/
public static LazyOptional getFluidHandler(@NotNull ItemStack itemStack)
{
- return itemStack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY);
+ return itemStack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM);
}
/**
@@ -445,14 +444,12 @@ public class FluidUtil
public static LazyOptional getFluidHandler(Level level, BlockPos blockPos, @Nullable Direction side)
{
BlockState state = level.getBlockState(blockPos);
- Block block = state.getBlock();
-
if (state.hasBlockEntity())
{
BlockEntity blockEntity = level.getBlockEntity(blockPos);
if (blockEntity != null)
{
- return blockEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side);
+ return blockEntity.getCapability(ForgeCapabilities.FLUID_HANDLER, side);
}
}
return LazyOptional.empty();
diff --git a/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java b/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java
index b0ee883baf..c458ed93ca 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java
@@ -8,17 +8,24 @@ package net.minecraftforge.fluids.capability;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.capabilities.CapabilityToken;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+@Deprecated(forRemoval = true, since = "1.19.2")
public class CapabilityFluidHandler
{
- public static Capability FLUID_HANDLER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
- public static Capability FLUID_HANDLER_ITEM_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+ /**
+ * @deprecated Create your own reference using {@link CapabilityManager#get(CapabilityToken)}, or use
+ * {@link ForgeCapabilities#FLUID_HANDLER}.
+ */
+ @Deprecated(forRemoval = true, since = "1.19.2")
+ public static Capability FLUID_HANDLER_CAPABILITY = ForgeCapabilities.FLUID_HANDLER;
+ /**
+ * @deprecated Create your own reference using {@link CapabilityManager#get(CapabilityToken)}, or use
+ * {@link ForgeCapabilities#FLUID_HANDLER_ITEM}.
+ */
+ @Deprecated(forRemoval = true, since = "1.19.2")
+ public static Capability FLUID_HANDLER_ITEM_CAPABILITY = ForgeCapabilities.FLUID_HANDLER_ITEM;
- public static void register(RegisterCapabilitiesEvent event)
- {
- event.register(IFluidHandler.class);
-
- event.register(IFluidHandlerItem.class);
- }
+ public static void register(RegisterCapabilitiesEvent event){}
}
diff --git a/src/main/java/net/minecraftforge/fluids/capability/FluidHandlerBlockEntity.java b/src/main/java/net/minecraftforge/fluids/capability/FluidHandlerBlockEntity.java
index 309f937580..9f8b964fc2 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/FluidHandlerBlockEntity.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/FluidHandlerBlockEntity.java
@@ -12,6 +12,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.core.Direction;
import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidType;
import net.minecraftforge.fluids.capability.templates.FluidTank;
@@ -47,7 +48,7 @@ public class FluidHandlerBlockEntity extends BlockEntity
@NotNull
public LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction facing)
{
- if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
+ if (capability == ForgeCapabilities.FLUID_HANDLER)
return holder.cast();
return super.getCapability(capability, facing);
}
diff --git a/src/main/java/net/minecraftforge/fluids/capability/IFluidHandler.java b/src/main/java/net/minecraftforge/fluids/capability/IFluidHandler.java
index 83f7c86589..5beda9701f 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/IFluidHandler.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/IFluidHandler.java
@@ -5,6 +5,7 @@
package net.minecraftforge.fluids.capability;
+import net.minecraftforge.common.capabilities.AutoRegisterCapability;
import net.minecraftforge.fluids.*;
import org.jetbrains.annotations.NotNull;
@@ -14,6 +15,7 @@ import org.jetbrains.annotations.NotNull;
*
* A reference implementation is provided {@link TileFluidHandler}.
*/
+@AutoRegisterCapability
public interface IFluidHandler
{
enum FluidAction {
diff --git a/src/main/java/net/minecraftforge/fluids/capability/IFluidHandlerItem.java b/src/main/java/net/minecraftforge/fluids/capability/IFluidHandlerItem.java
index 1f13b5dc8a..df6846129d 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/IFluidHandlerItem.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/IFluidHandlerItem.java
@@ -6,12 +6,15 @@
package net.minecraftforge.fluids.capability;
import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.capabilities.AutoRegisterCapability;
+
import org.jetbrains.annotations.NotNull;
/**
* ItemStacks handled by an {@link IFluidHandler} may change, so this class allows
* users of the fluid handler to get the container after it has been used.
*/
+@AutoRegisterCapability
public interface IFluidHandlerItem extends IFluidHandler
{
/**
diff --git a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java
index 2b75d1c511..431bf3461d 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java
@@ -9,10 +9,10 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.core.Direction;
import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.*;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
import org.jetbrains.annotations.NotNull;
@@ -212,7 +212,7 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv
@NotNull
public LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction facing)
{
- return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
+ return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(capability, holder);
}
/**
diff --git a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java
index 598fde5159..4b6b6dc857 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java
@@ -9,11 +9,11 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.core.Direction;
import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -189,7 +189,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili
@NotNull
public LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction facing)
{
- return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
+ return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(capability, holder);
}
/**
diff --git a/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java b/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java
index 007f272e24..3bf348b09d 100644
--- a/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java
+++ b/src/main/java/net/minecraftforge/fluids/capability/wrappers/FluidBucketWrapper.java
@@ -9,13 +9,13 @@ import net.minecraft.world.level.material.Fluids;
import net.minecraft.core.Direction;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidType;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.Item;
@@ -172,6 +172,6 @@ public class FluidBucketWrapper implements IFluidHandlerItem, ICapabilityProvide
@NotNull
public LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction facing)
{
- return CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY.orEmpty(capability, holder);
+ return ForgeCapabilities.FLUID_HANDLER_ITEM.orEmpty(capability, holder);
}
}
diff --git a/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java b/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java
index 67fcb010e7..dbc9e915fd 100644
--- a/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java
+++ b/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java
@@ -8,15 +8,18 @@ package net.minecraftforge.items;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.capabilities.CapabilityToken;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+@Deprecated(forRemoval = true, since = "1.19.2")
public class CapabilityItemHandler
{
- public static final Capability ITEM_HANDLER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+ /**
+ * @deprecated Create your own reference using {@link CapabilityManager#get(CapabilityToken)}, or use {@link ForgeCapabilities#ITEM_HANDLER}.
+ */
+ @Deprecated(forRemoval = true, since = "1.19.2")
+ public static final Capability ITEM_HANDLER_CAPABILITY = ForgeCapabilities.ITEM_HANDLER;
- public static void register(RegisterCapabilitiesEvent event)
- {
- event.register(IItemHandler.class);
- }
+ public static void register(RegisterCapabilitiesEvent event){}
}
diff --git a/src/main/java/net/minecraftforge/items/IItemHandler.java b/src/main/java/net/minecraftforge/items/IItemHandler.java
index f9a7fdd94a..f208bacf32 100644
--- a/src/main/java/net/minecraftforge/items/IItemHandler.java
+++ b/src/main/java/net/minecraftforge/items/IItemHandler.java
@@ -7,10 +7,12 @@ package net.minecraftforge.items;
import net.minecraft.world.Container;
import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.capabilities.AutoRegisterCapability;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import org.jetbrains.annotations.NotNull;
+@AutoRegisterCapability
public interface IItemHandler
{
/**
diff --git a/src/main/java/net/minecraftforge/items/VanillaInventoryCodeHooks.java b/src/main/java/net/minecraftforge/items/VanillaInventoryCodeHooks.java
index 27b80af5c1..1b75dfb09d 100644
--- a/src/main/java/net/minecraftforge/items/VanillaInventoryCodeHooks.java
+++ b/src/main/java/net/minecraftforge/items/VanillaInventoryCodeHooks.java
@@ -12,6 +12,7 @@ import net.minecraft.world.level.block.entity.Hopper;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.DispenserBlockEntity;
import net.minecraft.world.level.block.entity.HopperBlockEntity;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.util.Mth;
@@ -242,7 +243,7 @@ public class VanillaInventoryCodeHooks
BlockEntity blockEntity = worldIn.getBlockEntity(blockpos);
if (blockEntity != null)
{
- return blockEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side)
+ return blockEntity.getCapability(ForgeCapabilities.ITEM_HANDLER, side)
.map(capability -> ImmutablePair.of(capability, blockEntity));
}
}
diff --git a/src/test/java/net/minecraftforge/debug/misc/GameTestTest.java b/src/test/java/net/minecraftforge/debug/misc/GameTestTest.java
index 9d08ab6d56..e6126d1734 100644
--- a/src/test/java/net/minecraftforge/debug/misc/GameTestTest.java
+++ b/src/test/java/net/minecraftforge/debug/misc/GameTestTest.java
@@ -27,8 +27,8 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.EnergyStorage;
import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.event.RegisterGameTestsEvent;
@@ -55,6 +55,7 @@ public class GameTestTest
private static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
private static final RegistryObject ENERGY_BLOCK = BLOCKS.register("energy_block",
() -> new EnergyBlock(Properties.of(Material.STONE, MaterialColor.STONE)));
+ @SuppressWarnings("unused")
private static final RegistryObject- ENERGY_BLOCK_ITEM = ITEMS.register("energy_block",
() -> new BlockItem(ENERGY_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject> ENERGY_BLOCK_ENTITY = BLOCK_ENTITIES.register("energy",
@@ -167,7 +168,7 @@ public class GameTestTest
helper.setBlock(energyPos, ENERGY_BLOCK.get());
// Queries the energy capability
- LazyOptional energyHolder = helper.getBlockEntity(energyPos).getCapability(CapabilityEnergy.ENERGY);
+ LazyOptional energyHolder = helper.getBlockEntity(energyPos).getCapability(ForgeCapabilities.ENERGY);
// Adds 2000 FE, but our energy storage can only hold 1000 FE
energyHolder.ifPresent(energyStorage -> energyStorage.receiveEnergy(2000, false));
@@ -212,7 +213,7 @@ public class GameTestTest
@Override
public LazyOptional getCapability(@NotNull Capability capability, @Nullable Direction facing)
{
- if (capability == CapabilityEnergy.ENERGY)
+ if (capability == ForgeCapabilities.ENERGY)
return energyHolder.cast();
return super.getCapability(capability, facing);