Move apply() to common interface and rename as with()

src/main/java/com/enderio/regilite/holder/RegiliteBlock.java

@@ -28,7 +28,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class RegiliteBlock<T extends Block> extends DeferredBlock<T> implements ITagagble<Block> {
+public class RegiliteBlock<T extends Block> extends DeferredBlock<T> implements ITagagble<Block>, RegiliteHolder<RegiliteBlock<T>> {
  private final Supplier<String> supplier = () -> get().getDescriptionId();
  private final Regilite regilite;
  private Set<TagKey<Block>> blockTags = Set.of();

src/main/java/com/enderio/regilite/holder/RegiliteBlockEntity.java

@@ -30,7 +30,8 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class RegiliteBlockEntity<T extends BlockEntity> extends DeferredHolder<BlockEntityType<? extends BlockEntity>, BlockEntityType<T>> implements ITagagble<BlockEntityType<?>> {
+public class RegiliteBlockEntity<T extends BlockEntity> extends DeferredHolder<BlockEntityType<? extends BlockEntity>, BlockEntityType<T>>
+ implements ITagagble<BlockEntityType<?>>, RegiliteHolder<RegiliteBlockEntity<T>> {
  protected Set<TagKey<BlockEntityType<?>>> BlockEntityTags = new HashSet<>();
  protected Supplier<Function<BlockEntityRendererProvider.Context, BlockEntityRenderer<? super T>>> renderer;
 
@@ -79,17 +80,11 @@ public Supplier<Function<BlockEntityRendererProvider.Context, BlockEntityRendere
  return renderer;
  }
 
- public <TCap, TContext> RegiliteBlockEntity<T> addCapability(BlockCapability<TCap, TContext> capability, ICapabilityProvider<? super T, TContext, TCap> provider) {
+ public <TCap, TContext> RegiliteBlockEntity<T> withCapability(BlockCapability<TCap, TContext> capability, ICapabilityProvider<? super T, TContext, TCap> provider) {
  attachedCapabilityList.add(new AttachedCapability<>(capability, provider));
  return this;
  }
 
- // Allows wrapping common holder builder methods into other methods and applying them.
- public RegiliteBlockEntity<T> apply(Consumer<RegiliteBlockEntity<T>> applicator) {
- applicator.accept(this);
- return this;
- }
-
  @ApiStatus.Internal
  public void registerCapabilityProviders(RegisterCapabilitiesEvent event) {
  for (AttachedCapability<T, ?, ?> capabilityProvider : attachedCapabilityList) {

src/main/java/com/enderio/regilite/holder/RegiliteEntity.java

@@ -21,7 +21,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class RegiliteEntity<T extends Entity> extends DeferredHolder<EntityType<? extends Entity>, EntityType<T>> implements ITagagble<EntityType<?>> {
+public class RegiliteEntity<T extends Entity> extends DeferredHolder<EntityType<? extends Entity>, EntityType<T>> implements ITagagble<EntityType<?>>, RegiliteHolder<RegiliteEntity<T>> {
  private final Set<TagKey<EntityType<?>>> entityTags = new HashSet<>();
  private final Supplier<String> supplier = () -> get().getDescriptionId();
  private final Regilite regilite;

src/main/java/com/enderio/regilite/holder/RegiliteFluid.java

@@ -28,7 +28,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class RegiliteFluid<T extends FluidType> extends DeferredHolder<FluidType, T> implements ITagagble<Fluid> {
+public class RegiliteFluid<T extends FluidType> extends DeferredHolder<FluidType, T> implements ITagagble<Fluid>, RegiliteHolder<RegiliteFluid<T>> {
  private final Supplier<String> descriptionIdSupplier = () -> get().getDescriptionId();
  private final Regilite regilite;
  private Set<TagKey<Fluid>> fluidTags = Set.of();

src/main/java/com/enderio/regilite/holder/RegiliteHolder.java

@@ -0,0 +1,19 @@
+package com.enderio.regilite.holder;
+
+import java.util.function.Consumer;
+
+public interface RegiliteHolder<T extends RegiliteHolder<T>> {
+
+ /**
+ * Mutate this object using the provided applicator.
+ * This can be used to collect common combinations of modifications together to reduce repetition.
+ * @param applicator An applicator that will modify the object.
+ * @return The object.
+ */
+ default T with(Consumer<T> applicator) {
+ //noinspection unchecked
+ T self = (T)this;
+ applicator.accept(self);
+ return self;
+ }
+}

src/main/java/com/enderio/regilite/holder/RegiliteItem.java

@@ -17,7 +17,6 @@
 import net.neoforged.neoforge.capabilities.ICapabilityProvider;
 import net.neoforged.neoforge.capabilities.ItemCapability;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
-import net.neoforged.neoforge.fluids.FluidType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredItem;
 import org.jetbrains.annotations.ApiStatus;
@@ -28,7 +27,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-public class RegiliteItem<T extends Item> extends DeferredItem<T> implements ITagagble<Item> {
+public class RegiliteItem<T extends Item> extends DeferredItem<T> implements ITagagble<Item>, RegiliteHolder<RegiliteItem<T>> {
  private final Supplier<String> supplier = () -> get().getDescriptionId();
  private final Regilite regilite;
  protected Set<TagKey<Item>> ItemTags = new HashSet<>();
@@ -96,17 +95,11 @@ public RegiliteItem<T> setColorSupplier(Supplier<Supplier<ItemColor>> colorSuppl
  return this;
  }
 
- public <TCap, TContext> RegiliteItem<T> addCapability(ItemCapability<TCap, TContext> capability, ICapabilityProvider<ItemStack, TContext, TCap> provider) {
+ public <TCap, TContext> RegiliteItem<T> withCapability(ItemCapability<TCap, TContext> capability, ICapabilityProvider<ItemStack, TContext, TCap> provider) {
  attachedCapabilityList.add(new AttachedCapability<>(capability, provider));
  return this;
  }
 
- // Allows wrapping common holder builder methods into other methods and applying them.
- public RegiliteItem<T> apply(Consumer<RegiliteItem<T>> applicator) {
- applicator.accept(this);
- return this;
- }
-
  @ApiStatus.Internal
  public void registerCapabilityProviders(RegisterCapabilitiesEvent event) {
  for (AttachedCapability<T, ?, ?> capabilityProvider : attachedCapabilityList) {

src/main/java/com/enderio/regilite/holder/RegiliteMenu.java

@@ -14,7 +14,7 @@
 
 import java.util.function.Supplier;
 
-public class RegiliteMenu<T extends AbstractContainerMenu> extends DeferredHolder<MenuType<? extends AbstractContainerMenu>, MenuType<T>> {
+public class RegiliteMenu<T extends AbstractContainerMenu> extends DeferredHolder<MenuType<? extends AbstractContainerMenu>, MenuType<T>> implements RegiliteHolder<RegiliteMenu<T>> {
 
  private Supplier<IScreenConstructor<T, ? extends AbstractContainerScreen<T>>> screenConstructor;