Minor cleanup

Signed-off-by: roadhog360 <[email protected]>

Author: Roadhog360

dependencies.gradle

@@ -57,6 +57,6 @@ dependencies {
     compileOnly('curse.maven:hardcore-ender-expansion-228015:2316923')
 
     compileOnly('org.jetbrains:annotations:24.0.1')
-    compileOnly("org.projectlombok:lombok:1.18.36") { transitive = false }
-    annotationProcessor("org.projectlombok:lombok:1.18.36")
+    compileOnly("org.projectlombok:lombok:1.18.42") { transitive = false }
+    annotationProcessor("org.projectlombok:lombok:1.18.42")
 }

src/main/java/roadhog360/hogutils/api/blocksanditems/block/BaseFlower.java

@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
-public abstract class BaseFlower extends BlockFlower implements ISubtypesBlock {
+public abstract class BaseFlower extends BlockFlower implements ISubtypesBlock, IPotableData {
 
     /// This CANNOT be an array, NotEnoughIDs has NEGATIVE metas, so we need this instead.
     private final Map<Integer, IIcon> icons = new Int2ObjectArrayMap<>();
@@ -118,4 +118,9 @@ public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> list) {
             }
         }
     }
+
+    @Override
+    public boolean isPotable(int meta) {
+        return isMetadataEnabled(meta);
+    }
 }

src/main/java/roadhog360/hogutils/api/blocksanditems/block/ICustomActivateSound.java

@@ -25,7 +25,8 @@ public interface ICustomActivateSound {
     /// @param z
     /// @param prevSound The previous sound that you are overriding
     /// @return The suffix to add to {@link ICustomActivateSound#getSound(World, int, int, int, String)}.
-    /// Don't forget to add the dot at the start! (This is mandatory in case you have a setup where you don't want the dot for some reason)
+    /// Don't forget to add the dot at the start!
+    /// Adding the dot yourself is mandatory in case you have a setup where you don't want the dot for some reason.
     @NonNull
     default String getSuffix(World world, int x, int y, int z, String prevSound) {
         if (prevSound.contains("random.door") || prevSound.contains("random.chest")) {

src/main/java/roadhog360/hogutils/api/blocksanditems/block/IPotableData.java

@@ -0,0 +1,6 @@
+package roadhog360.hogutils.api.blocksanditems.block;
+
+/// Is this Block potable?
+public interface IPotableData {
+    boolean isPotable(int meta);
+}

src/main/java/roadhog360/hogutils/api/blocksanditems/block/itemblock/BaseItemBlockPotable.java

@@ -0,0 +1,42 @@
+package roadhog360.hogutils.api.blocksanditems.utils;
+
+import net.minecraft.util.IIcon;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+@ApiStatus.NonExtendable
+public class MetaVariant {
+    public static int NO_OVERRIDE = -2;
+
+    @Nullable
+    protected String displayName;
+    @Nullable
+    protected String iconName;
+    @Nullable
+    protected IIcon icon;
+
+    public MetaVariant(@Nullable String name) {
+        this(name, name);
+    }
+
+    public MetaVariant(@Nullable String displayName, @Nullable String iconName) {
+        this.displayName = displayName;
+        this.iconName = iconName;
+    }
+
+    public @Nullable String getDisplayName() {
+        return displayName;
+    }
+
+    public @Nullable String getIconName() {
+        return iconName;
+    }
+
+    public @Nullable IIcon getIcon() {
+        return icon;
+    }
+
+    public void setIcon(IIcon icon) {
+        this.icon = icon;
+    }
+}

src/main/java/roadhog360/hogutils/api/blocksanditems/utils/MetaVariant.java

@@ -6,8 +6,14 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import org.jetbrains.annotations.Nullable;
-import roadhog360.hogutils.api.blocksanditems.block.*;
-import roadhog360.hogutils.api.blocksanditems.block.itemblock.*;
+import roadhog360.hogutils.api.blocksanditems.block.BaseDoor;
+import roadhog360.hogutils.api.blocksanditems.block.BaseLeaves;
+import roadhog360.hogutils.api.blocksanditems.block.BaseSlab;
+import roadhog360.hogutils.api.blocksanditems.block.ISubtypesBlock;
+import roadhog360.hogutils.api.blocksanditems.block.itemblock.BaseDoorItemBlock;
+import roadhog360.hogutils.api.blocksanditems.block.itemblock.BaseItemBlock;
+import roadhog360.hogutils.api.blocksanditems.block.itemblock.BaseLeavesItemBlock;
+import roadhog360.hogutils.api.blocksanditems.block.itemblock.BaseSlabItemBlock;
 import roadhog360.hogutils.api.blocksanditems.utils.base.RegistryEntry;
 
 public class RegistryEntryBlock extends RegistryEntry<Block> {
@@ -21,7 +27,7 @@ public class RegistryEntryBlock extends RegistryEntry<Block> {
 
     public RegistryEntryBlock(String name, boolean isEnabled, Block block) {
         super(name, isEnabled, block);
-        this.itemBlockClass = guessItemBlock(block);
+        this.itemBlockClass = getItemBlock(block);
         this.itemBlockCtorArgs = new Object[0];
     }
 
@@ -34,16 +40,15 @@ public RegistryEntryBlock(String name, boolean isEnabled, Block block,
                                   @Nullable Class<? extends ItemBlock> itemBlockClass, @Nullable Object... itemBlockCtorArgs) {
         super(name, isEnabled, block);
         this.itemBlockClass = itemBlockClass;
-        this.itemBlockCtorArgs = itemBlockCtorArgs;
+        this.itemBlockCtorArgs = itemBlockCtorArgs == null ? new Object[0] : itemBlockCtorArgs;
     }
 
     /// Used when no ItemBlock is passed; we guess what it should get.
     /// This is used for convenience so every single block with sub blocks doesn't need to declare that;
     /// only special ItemBlocks that don't fit this criteria or no (null) ItemBlocks should need deliberate declaration.
-    protected Class<? extends ItemBlock> guessItemBlock(Block block) {
+    protected Class<? extends ItemBlock> getItemBlock(Block block) {
         return block instanceof BaseSlab ? BaseSlabItemBlock.class
               : block instanceof BaseDoor ? BaseDoorItemBlock.class
-              : block instanceof BaseFlower ? BaseItemBlockPotable.class
               : block instanceof BaseLeaves ? BaseLeavesItemBlock.class
               : block instanceof ISubtypesBlock ? BaseItemBlock.class
               : ItemBlock.class;
@@ -60,11 +65,7 @@ public Item getItemBlock() {
     @Override
     protected void doRegistration() {
         if (hasItemBlock()) { // If this block has an ItemBlock, check whether it should be registered with constructor args
-            if(itemBlockCtorArgs != null) {
-                GameRegistry.registerBlock(object, itemBlockClass, name.toLowerCase(), itemBlockCtorArgs);
-            } else {
-                GameRegistry.registerBlock(object, itemBlockClass, name.toLowerCase());
-            }
+            GameRegistry.registerBlock(object, itemBlockClass, name.toLowerCase(), itemBlockCtorArgs);
         } else {
             GameRegistry.registerBlock(object, null, name.toLowerCase());
         }

src/main/java/roadhog360/hogutils/api/blocksanditems/utils/RegistryEntryBlock.java

@@ -1,6 +1,7 @@
 package roadhog360.hogutils.api.blocksanditems.utils.base;
 
 import roadhog360.hogutils.api.blocksanditems.IReferenceBase;
+import roadhog360.hogutils.api.utils.GenericUtils;
 
 import java.util.Collection;
 
@@ -35,13 +36,13 @@ public void register() {
     protected abstract void doRegistration();
 
     /// Enforce lower alphanumeric with underscores and slashes
-    /// I do the lowercasing automatically but I check anyways in case this function is called from a custom class
+    /// I do the lowercasing automatically, but I check anyway in case this function is called from a custom class
     protected void checkName(String name) {
-        if (!name.matches("^[a-z0-9_/]*$")) {
+        if (!GenericUtils.isLowerAlphaNumeric(name)) {
             throw new IllegalArgumentException(
                 "Don't register a non-alphanumeric name! Just because you can doesn't mean you should!" +
                     "Forge should prevent this, so I'm doing their work for them..." +
-                    "If you want to use my helper tools, alphanumeric ONLY with underscores (_) and forward slashes! (/)"
+                    "If you want to use my helper tools, names that alphanumeric ONLY with underscores (_) and forward slashes (/) are allowed!"
             );
         }
     }

src/main/java/roadhog360/hogutils/api/blocksanditems/utils/base/RegistryEntry.java

@@ -80,15 +80,13 @@ public static void enforceTagsSpec(String... tags) {
 
     /// Ensures the spec of tags is enforced, and checks the passed in tags for compliance.
     /// If the following spec is not met, the game will throw an {@link IllegalArgumentException}.
-    /// - Must have a properly namespaced ID. For example, `examplemod:example` is correct, but `examplemod` isn't.
+    /// - Must have a properly namespaced ID. For example, `examplemod:example` is correct, but `example` isn't.
     /// - `#` is purely for display purposes and tags in the registry do not have it.
+    /// - Must not contain any characters disallowed by the Windows filesystem. (except for `:`, and `/`)
     /// If these conditions are not met, the game will throw an {@link IllegalArgumentException}.
     public static void enforceTagSpec(String tag) {
-        if (tag == null || tag.isEmpty() || tag.equals("#") || tag.equals(":") || tag.equals("#:")) {
-            throw new IllegalArgumentException("Cannot pass in empty tag (or just \"#\") to the tags registry!");
-        }
-        if (!GenericUtils.verifyFilenameIntegrity(tag, ALLOWED_CHARS)) {
-            throw new IllegalArgumentException("Cannot instantiate tag with disallowed characters from Windows filesystem! Received [" + tag + "]");
+        if (tag == null || tag.isEmpty()) {
+            throw new IllegalArgumentException("Cannot pass in empty tag to the tags registry!");
         }
         if (tag.startsWith("#")) {
             throw new IllegalArgumentException("Tag should not start with #; the # is for display purposes only and doesn't \"exist\". Received [" + tag + "]");

src/main/java/roadhog360/hogutils/api/hogtags/helpers/MiscHelpers.java

@@ -220,6 +220,10 @@ public static boolean verifyFilenameIntegrity(@NonNull String string, char @Null
         return true;
     }
 
+    public static boolean isLowerAlphaNumeric(String name) {
+        return name.matches("^[a-z0-9_/]*$");
+    }
+
     public static class Constants {
         public static final float[][] COLORS_RGB = EntitySheep.fleeceColorTable;