diff --git a/src/main/java/slimeknights/mantle/registration/adapter/BlockRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/BlockRegistryAdapter.java index be55ed8..d1ab5c1 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/BlockRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/BlockRegistryAdapter.java @@ -23,10 +23,12 @@ import java.util.function.Supplier; @SuppressWarnings({"unused", "WeakerAccess"}) public class BlockRegistryAdapter extends EnumRegistryAdapter { + /** @inheritDoc */ public BlockRegistryAdapter(IForgeRegistry registry) { super(registry); } + /** @inheritDoc */ public BlockRegistryAdapter(IForgeRegistry registry, String modid) { super(registry, modid); } diff --git a/src/main/java/slimeknights/mantle/registration/adapter/ContainerTypeRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/ContainerTypeRegistryAdapter.java index 2313df5..2a68b77 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/ContainerTypeRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/ContainerTypeRegistryAdapter.java @@ -7,10 +7,12 @@ import net.minecraftforge.fml.network.IContainerFactory; import net.minecraftforge.registries.IForgeRegistry; public class ContainerTypeRegistryAdapter extends RegistryAdapter> { + /** @inheritDoc */ public ContainerTypeRegistryAdapter(IForgeRegistry> registry, String modId) { super(registry, modId); } + /** @inheritDoc */ public ContainerTypeRegistryAdapter(IForgeRegistry> registry) { super(registry); } diff --git a/src/main/java/slimeknights/mantle/registration/adapter/EntityTypeRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/EntityTypeRegistryAdapter.java index c0d72b7..6de15eb 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/EntityTypeRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/EntityTypeRegistryAdapter.java @@ -8,10 +8,12 @@ import net.minecraftforge.registries.IForgeRegistry; * Registry adapter for registering entity types */ public class EntityTypeRegistryAdapter extends RegistryAdapter> { + /** @inheritDoc */ public EntityTypeRegistryAdapter(IForgeRegistry> registry, String modId) { super(registry, modId); } + /** @inheritDoc */ public EntityTypeRegistryAdapter(IForgeRegistry> registry) { super(registry); } diff --git a/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java index 88f8a7e..b644eef 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/EnumRegistryAdapter.java @@ -15,10 +15,12 @@ import java.util.function.Function; @SuppressWarnings({"unused", "WeakerAccess"}) public class EnumRegistryAdapter> extends RegistryAdapter { + /** @inheritDoc */ public EnumRegistryAdapter(IForgeRegistry registry) { super(registry); } + /** @inheritDoc */ public EnumRegistryAdapter(IForgeRegistry registry, String modId) { super(registry, modId); } diff --git a/src/main/java/slimeknights/mantle/registration/adapter/FluidRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/FluidRegistryAdapter.java index 124154e..bb25d0c 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/FluidRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/FluidRegistryAdapter.java @@ -13,10 +13,12 @@ import java.util.function.Function; * Registry adapter for registering fluids */ public class FluidRegistryAdapter extends RegistryAdapter { + /** @inheritDoc */ public FluidRegistryAdapter(IForgeRegistry registry) { super(registry); } + /** @inheritDoc */ public FluidRegistryAdapter(IForgeRegistry registry, String modId) { super(registry, modId); } diff --git a/src/main/java/slimeknights/mantle/registration/adapter/ItemRegistryAdapter.java b/src/main/java/slimeknights/mantle/registration/adapter/ItemRegistryAdapter.java index ea100fc..ddeffe7 100644 --- a/src/main/java/slimeknights/mantle/registration/adapter/ItemRegistryAdapter.java +++ b/src/main/java/slimeknights/mantle/registration/adapter/ItemRegistryAdapter.java @@ -6,9 +6,11 @@ import net.minecraft.fluid.Fluid; import net.minecraft.item.BlockItem; import net.minecraft.item.BucketItem; import net.minecraft.item.Item; +import net.minecraft.item.Item.Properties; import net.minecraft.item.SpawnEggItem; import net.minecraftforge.registries.IForgeRegistry; import slimeknights.mantle.item.BlockTooltipItem; +import slimeknights.mantle.item.TooltipItem; import slimeknights.mantle.registration.ItemProperties; import slimeknights.mantle.registration.object.BuildingBlockObject; import slimeknights.mantle.registration.object.EnumObject; @@ -16,6 +18,8 @@ import slimeknights.mantle.registration.object.FenceBuildingBlockObject; import slimeknights.mantle.registration.object.WallBuildingBlockObject; import javax.annotation.Nullable; +import java.util.function.BiFunction; +import java.util.function.Function; import java.util.function.Supplier; /** @@ -25,6 +29,19 @@ import java.util.function.Supplier; public class ItemRegistryAdapter extends EnumRegistryAdapter { private final Item.Properties defaultProps; + /** + * Registers a new item registry adapter with default mod ID and item properties + * @param registry Item registry instance + */ + public ItemRegistryAdapter(IForgeRegistry registry) { + this(registry, null); + } + + /** + * Registers a new item registry adapter with default mod ID + * @param registry Item registry instance + * @param defaultProps Default item properties + */ public ItemRegistryAdapter(IForgeRegistry registry, @Nullable Item.Properties defaultProps) { super(registry); if (defaultProps == null) { @@ -34,6 +51,12 @@ public class ItemRegistryAdapter extends EnumRegistryAdapter { } } + /** + * Registers a new item registry adapter with a specific mod ID + * @param registry Item registry instance + * @param modid Mod ID override + * @param defaultProps Default item properties + */ public ItemRegistryAdapter(IForgeRegistry registry, String modid, @Nullable Item.Properties defaultProps) { super(registry, modid); if (defaultProps == null) { @@ -43,6 +66,38 @@ public class ItemRegistryAdapter extends EnumRegistryAdapter { } } + /* Item helpers */ + + /** + * Registers a generic tooltip item using the default props + * @param name Item name + * @return Registered item + */ + public TooltipItem register(String name) { + return register(defaultProps, name); + } + + /** + * Registers a generic tooltip item from the given props + * @param props Item properties + * @param name Item name + * @return Registered item + */ + public TooltipItem register(Item.Properties props, String name) { + return register(new TooltipItem(props), name); + } + + /** + * Registers an item with the default properties + * @param constructor Item constructor + * @param name Item name + * @param Item type + * @return Registered item + */ + public T register(Function constructor, String name) { + return register(constructor.apply(defaultProps), name); + } + /* Standard block items */ @@ -60,6 +115,17 @@ public class ItemRegistryAdapter extends EnumRegistryAdapter { return registerBlockItem(block, defaultProps); } + /** + * Registers a block item with default properties using the given constructor + * @param block Block instance + * @param constructor Constructor + * @param Result block item type + * @return Registered block item + */ + public T registerBlockItem(Block block, BiFunction constructor) { + return register(constructor.apply(block, defaultProps), block); + } + /** * Same as the variant without ItemGroup, but registers it for the given itemgroup. * @param block The block you want to have an item for