Tidy up internal API and optimise imports

src/main/java/com/enderio/regilite/Regilite.java

@@ -6,18 +6,18 @@
 package com.enderio.regilite;
 
 import com.enderio.regilite.blockentities.RegiliteBlockEntities;
-import com.enderio.regilite.fluids.RegiliteFluidTypes;
-import com.enderio.regilite.utils.BundledDataProvider;
+import com.enderio.regilite.blocks.RegiliteBlocks;
 import com.enderio.regilite.data.RegiliteDataProvider;
 import com.enderio.regilite.events.EntityRendererEvents;
 import com.enderio.regilite.events.ScreenEvents;
-import com.enderio.regilite.blocks.RegiliteBlocks;
+import com.enderio.regilite.fluids.RegiliteFluidTypes;
 import com.enderio.regilite.items.RegiliteItems;
 import com.enderio.regilite.lang.RegiliteLang;
 import com.enderio.regilite.loot.RegiliteLootTables;
-import com.enderio.regilite.tags.RegiliteTags;
 import com.enderio.regilite.registry.EntityRegistry;
 import com.enderio.regilite.registry.MenuRegistry;
+import com.enderio.regilite.tags.RegiliteTags;
+import com.enderio.regilite.utils.BundledDataProvider;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectList;
 import net.minecraft.world.entity.EntityType;

src/main/java/com/enderio/regilite/blockentities/RegiliteBlockEntities.java

@@ -3,7 +3,6 @@
 import com.enderio.regilite.Regilite;
 import com.enderio.regilite.RegiliteModuleEvents;
 import com.enderio.regilite.RegiliteRegistryModule;
-import com.enderio.regilite.blocks.RegiliteBlocks;
 import com.enderio.regilite.tags.RegiliteTags;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectList;

src/main/java/com/enderio/regilite/blockentities/RegiliteClientBlockEntities.java

@@ -4,7 +4,7 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 
-public class RegiliteClientBlockEntities {
+class RegiliteClientBlockEntities {
     private final RegiliteBlockEntities regiliteBlockEntities;
 
     public RegiliteClientBlockEntities(RegiliteBlockEntities regiliteBlockEntities) {

src/main/java/com/enderio/regilite/blocks/BlockBuilder.java

@@ -22,7 +22,6 @@
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
 import net.neoforged.neoforge.registries.DeferredBlock;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;

src/main/java/com/enderio/regilite/blocks/RegiliteClientBlocks.java

@@ -7,10 +7,8 @@
 
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
-import org.jetbrains.annotations.ApiStatus;
 
-@ApiStatus.Internal
-public class RegiliteClientBlocks {
+class RegiliteClientBlocks {
     private final RegiliteBlocks regiliteBlocks;
 
     public RegiliteClientBlocks(RegiliteBlocks regiliteBlocks) {

src/main/java/com/enderio/regilite/data/NewRegiliteDataProvider.java

@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
 
 public class NewRegiliteDataProvider implements DataProvider {
     private final String modId;

src/main/java/com/enderio/regilite/data/RegiliteDataProvider.java

@@ -17,7 +17,10 @@
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 

src/main/java/com/enderio/regilite/data/RegiliteTagProvider.java

@@ -12,9 +12,7 @@
 import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagKey;
-import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
-import net.neoforged.neoforge.fluids.FluidType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/com/enderio/regilite/items/ItemBuilder.java

@@ -22,7 +22,6 @@
 import net.neoforged.neoforge.capabilities.ItemCapability;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.registries.DeferredItem;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -90,11 +89,6 @@ public final ItemBuilder<T> tab(ResourceKey<CreativeModeTab> tab, Consumer<Creat
         return this;
     }
 
-    @ApiStatus.Internal
-    public Object2ObjectMap<ResourceKey<CreativeModeTab>, Consumer<CreativeModeTab.Output>> tabs() {
-        return tabs;
-    }
-
     public ItemBuilder<T> modelProvider(BiConsumer<RegiliteItemModelProvider, DataGenContext<Item, T>> modelProvider) {
         this.modelProvider = modelProvider;
         return this;
@@ -110,8 +104,7 @@ public <TCap, TContext> ItemBuilder<T> capability(ItemCapability<TCap, TContext>
         return this;
     }
 
-    @ApiStatus.Internal
-    public void attachCapabilities(RegisterCapabilitiesEvent event) {
+    void attachCapabilities(RegisterCapabilitiesEvent event) {
         for (var attachedCapability : attachedCapabilityList) {
             attachedCapability.registerProvider(event, get());
         }

src/main/java/com/enderio/regilite/items/RegiliteClientItems.java

@@ -5,13 +5,10 @@
 
 package com.enderio.regilite.items;
 
-import com.enderio.regilite.blocks.RegiliteBlocks;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
-import org.jetbrains.annotations.ApiStatus;
 
-@ApiStatus.Internal
-public class RegiliteClientItems {
+class RegiliteClientItems {
     private final RegiliteItems regiliteItems;
 
     public RegiliteClientItems(RegiliteItems regiliteItems) {

src/main/java/com/enderio/regilite/items/RegiliteItemModelProvider.java

@@ -19,7 +19,6 @@
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
 
-import java.util.List;
 import java.util.Objects;
 
 public class RegiliteItemModelProvider extends ItemModelProvider {

src/main/java/com/enderio/regilite/items/RegiliteItems.java

@@ -126,7 +126,7 @@ public void register(IEventBus modEventBus) {
 
     private void onBuildCreativeTabs(BuildCreativeModeTabContentsEvent event) {
         for (var item : items) {
-            var outputConsumer = item.tabs().get(event.getTabKey());
+            var outputConsumer = item.tabs.get(event.getTabKey());
             if (outputConsumer != null) {
                 outputConsumer.accept(event);
             }

src/main/java/com/enderio/regilite/lang/RegiliteLang.java

@@ -18,7 +18,6 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.common.data.LanguageProvider;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.neoforged.neoforge.fluids.FluidType;

src/main/java/com/enderio/regilite/loot/RegiliteLootTables.java

@@ -22,7 +22,7 @@
 // I don't think rich loot table support is something we need to provide, given I think its expressive enough in vanilla.
 public class RegiliteLootTables implements RegiliteModuleDataGen {
 
-    private ObjectList<Supplier<LootTableProvider.SubProviderEntry>> providerFactories = new ObjectArrayList<>();
+    private final ObjectList<Supplier<LootTableProvider.SubProviderEntry>> providerFactories = new ObjectArrayList<>();
 
     @ApiStatus.Internal
     public RegiliteLootTables() {

src/main/java/com/enderio/regilite/tags/RegiliteTags.java

@@ -81,16 +81,16 @@ public void gatherProviders(GatherDataEvent event, Consumer<DataProvider> addPro
 
     private class TagProvider<T> extends IntrinsicHolderTagsProvider<T> {
 
-        private final RegistryTagBuilder<T> tags;
+        private final RegistryTagBuilder<T> tagBuilder;
 
-        public TagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper, RegistryTagBuilder<T> tags) {
-            super(output, tags.registry(), lookupProvider, tags::getKey, modId, existingFileHelper);
-            this.tags = tags;
+        public TagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper, RegistryTagBuilder<T> tagBuilder) {
+            super(output, tagBuilder.registry(), lookupProvider, tagBuilder.keyExtractor, modId, existingFileHelper);
+            this.tagBuilder = tagBuilder;
         }
 
         @Override
         protected void addTags(HolderLookup.Provider provider) {
-            for (var pair : tags.entrySet()) {
+            for (var pair : tagBuilder.tags.entrySet()) {
                 //noinspection unchecked
                 T[] items = (T[])pair.getValue().entries().map(Supplier::get).toArray();
                 tag(pair.getKey()).add(items);

src/main/java/com/enderio/regilite/tags/RegistryTagBuilder.java

@@ -7,20 +7,17 @@
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectSet;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagKey;
-import org.jetbrains.annotations.ApiStatus;
 
-import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
 public final class RegistryTagBuilder<T> {
     private final ResourceKey<Registry<T>> registryKey;
-    private final Function<T, ResourceKey<T>> keyExtractor;
-    private final Object2ObjectMap<TagKey<T>, TagBuilder<T>> tags = new Object2ObjectOpenHashMap<>();
+    final Function<T, ResourceKey<T>> keyExtractor;
+    final Object2ObjectMap<TagKey<T>, TagBuilder<T>> tags = new Object2ObjectOpenHashMap<>();
 
     public RegistryTagBuilder(ResourceKey<Registry<T>> registryKey, Function<T, ResourceKey<T>> keyExtractor) {
         this.registryKey = registryKey;
@@ -41,15 +38,4 @@ public final void addToTags(Supplier<? extends T> entry, TagKey<T>... tags) {
             tag(tag).add(entry);
         }
     }
-
-    @ApiStatus.Internal
-    public ObjectSet<Map.Entry<TagKey<T>, TagBuilder<T>>> entrySet() {
-        return tags.entrySet();
-    }
-
-    // Even though its internal only, feels nicer to expose it as a method instead of a getter for the func.
-    @ApiStatus.Internal
-    public ResourceKey<T> getKey(T value) {
-        return keyExtractor.apply(value);
-    }
 }