This is useless anyway

mineLdiver · mineLdiver · commit 2b5cd040282f · 2025-07-27T21:59:30.000+05:00
diff --git a/station-container-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/GuiHandlerRegistry.java b/station-container-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/GuiHandlerRegistry.java
@@ -9,9 +9,8 @@
 import net.modificationstation.stationapi.api.util.Identifier;
 
 public final class GuiHandlerRegistry extends SimpleRegistry<GuiHandler> {
-    private static final GuiHandler EMPTY = new GuiHandler((player, inventory, packet) -> null, () -> null);
     public static final RegistryKey<GuiHandlerRegistry> KEY = RegistryKey.ofRegistry(Identifier.of(StationAPI.NAMESPACE, "gui_handlers"));
-    public static final GuiHandlerRegistry INSTANCE = Registries.create(KEY, new GuiHandlerRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final GuiHandlerRegistry INSTANCE = Registries.create(KEY, new GuiHandlerRegistry(), Lifecycle.experimental());
 
     private GuiHandlerRegistry() {
         super(KEY, Lifecycle.experimental(), false);
diff --git a/station-dimensions-v0/src/main/java/net/modificationstation/stationapi/api/registry/DimensionRegistry.java b/station-dimensions-v0/src/main/java/net/modificationstation/stationapi/api/registry/DimensionRegistry.java
@@ -45,7 +45,7 @@ public final class DimensionRegistry extends AbstractInt2ObjectMapBackedLegacyRe
 
     private static final DimensionContainer<OverworldDimension> OVERWORLD = new DimensionContainer<>(OverworldDimension::new);
     public static final RegistryKey<DimensionRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("dimensions"));
-    public static final DimensionRegistry INSTANCE = Registries.create(KEY, new DimensionRegistry(), registry -> OVERWORLD, Lifecycle.experimental());
+    public static final DimensionRegistry INSTANCE = Registries.create(KEY, new DimensionRegistry(), Lifecycle.experimental());
 
     /**
      * {@link DimensionRegistry#serialView} backend.
diff --git a/station-effects-api-v0/src/main/java/net/modificationstation/stationapi/api/effect/EntityEffectTypeRegistry.java b/station-effects-api-v0/src/main/java/net/modificationstation/stationapi/api/effect/EntityEffectTypeRegistry.java
@@ -11,7 +11,7 @@
 
 public class EntityEffectTypeRegistry extends SimpleRegistry<EntityEffectType<?>> {
     public static final RegistryKey<EntityEffectTypeRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("entity_effects"));
-    public static final EntityEffectTypeRegistry INSTANCE = Registries.create(KEY, new EntityEffectTypeRegistry(), registry -> null, Lifecycle.experimental());
+    public static final EntityEffectTypeRegistry INSTANCE = Registries.create(KEY, new EntityEffectTypeRegistry(), Lifecycle.experimental());
     
     private EntityEffectTypeRegistry() {
         super(KEY, Lifecycle.experimental(), true);
diff --git a/station-entities-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/EntityHandlerRegistry.java b/station-entities-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/EntityHandlerRegistry.java
@@ -9,9 +9,8 @@
 import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
 
 public final class EntityHandlerRegistry extends SimpleRegistry<EntityWorldAndPosFactory> {
-    private static final EntityWorldAndPosFactory EMPTY = (world, x, y, z) -> null;
     public static final RegistryKey<EntityHandlerRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("entity_handlers"));
-    public static final EntityHandlerRegistry INSTANCE = Registries.create(KEY, new EntityHandlerRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final EntityHandlerRegistry INSTANCE = Registries.create(KEY, new EntityHandlerRegistry(), Lifecycle.experimental());
 
     private EntityHandlerRegistry() {
         super(KEY, Lifecycle.experimental(), false);
diff --git a/station-entities-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/MobHandlerRegistry.java b/station-entities-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/MobHandlerRegistry.java
@@ -13,9 +13,8 @@
 
 public final class MobHandlerRegistry extends SimpleRegistry<Function<World, LivingEntity>> {
 
-    private static final Function<World, LivingEntity> EMPTY = world -> null;
     public static final RegistryKey<MobHandlerRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("mob_handlers"));
-    public static final MobHandlerRegistry INSTANCE = Registries.create(KEY, new MobHandlerRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final MobHandlerRegistry INSTANCE = Registries.create(KEY, new MobHandlerRegistry(), Lifecycle.experimental());
 
     private MobHandlerRegistry() {
         super(KEY, Lifecycle.experimental(), false);
diff --git a/station-flattening-v0/src/main/java/net/modificationstation/stationapi/api/registry/BlockRegistry.java b/station-flattening-v0/src/main/java/net/modificationstation/stationapi/api/registry/BlockRegistry.java
@@ -10,7 +10,7 @@
 public final class BlockRegistry extends SimpleRegistry<Block> {
 
     public static final RegistryKey<Registry<Block>> KEY = RegistryKey.ofRegistry(NAMESPACE.id("blocks"));
-    public static final BlockRegistry INSTANCE = Registries.create(KEY, new BlockRegistry(), registry -> Block.BLOCKS[0], Lifecycle.experimental());
+    public static final BlockRegistry INSTANCE = Registries.create(KEY, new BlockRegistry(), Lifecycle.experimental());
 
     private BlockRegistry() {
         super(KEY, Lifecycle.experimental(), true);
diff --git a/station-flattening-v0/src/main/java/net/modificationstation/stationapi/api/registry/ItemRegistry.java b/station-flattening-v0/src/main/java/net/modificationstation/stationapi/api/registry/ItemRegistry.java
@@ -11,7 +11,7 @@
 public final class ItemRegistry extends SimpleRegistry<Item> {
 
     public static final RegistryKey<Registry<Item>> KEY = RegistryKey.ofRegistry(NAMESPACE.id("items"));
-    public static final ItemRegistry INSTANCE = Registries.create(KEY, new ItemRegistry(), registry -> Item.IRON_SHOVEL, Lifecycle.experimental());
+    public static final ItemRegistry INSTANCE = Registries.create(KEY, new ItemRegistry(), Lifecycle.experimental());
     public static final int ID_SHIFT = 256;
     public static final Int2IntFunction SHIFTED_ID = id -> id - ID_SHIFT;
     public static final int AUTO_ID = SHIFTED_ID.get(Registry.AUTO_ID);
diff --git a/station-networking-v0/src/main/java/net/modificationstation/stationapi/api/registry/MessageListenerRegistry.java b/station-networking-v0/src/main/java/net/modificationstation/stationapi/api/registry/MessageListenerRegistry.java
@@ -18,7 +18,6 @@
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class MessageListenerRegistry {
-    private static final BiConsumer<PlayerEntity, MessagePacket> EMPTY = (player, message) -> {};
     public static final RegistryKey<Registry<BiConsumer<PlayerEntity, MessagePacket>>> KEY = RegistryKey.ofRegistry(NAMESPACE.id("message_listeners"));
-    public static final Registry<BiConsumer<PlayerEntity, MessagePacket>> INSTANCE = Registries.create(KEY, registry -> EMPTY);
+    public static final Registry<BiConsumer<PlayerEntity, MessagePacket>> INSTANCE = Registries.create(KEY);
 }
diff --git a/station-networking-v0/src/main/java/net/modificationstation/stationapi/api/registry/PacketTypeRegistry.java b/station-networking-v0/src/main/java/net/modificationstation/stationapi/api/registry/PacketTypeRegistry.java
@@ -9,7 +9,7 @@
 
 public final class PacketTypeRegistry extends SimpleRegistry<PacketType<?>> {
     public static final RegistryKey<Registry<PacketType<?>>> KEY = RegistryKey.ofRegistry(NAMESPACE.id("packet_types"));
-    public static final Registry<PacketType<?>> INSTANCE = Registries.create(KEY, new PacketTypeRegistry(), registry -> registry.get(NAMESPACE.id("registry/remap_client")), Lifecycle.experimental());
+    public static final Registry<PacketType<?>> INSTANCE = Registries.create(KEY, new PacketTypeRegistry(), Lifecycle.experimental());
 
     private PacketTypeRegistry() {
         super(KEY, Lifecycle.experimental(), true);
diff --git a/station-recipes-v0/src/main/java/net/modificationstation/stationapi/api/registry/JsonRecipeParserRegistry.java b/station-recipes-v0/src/main/java/net/modificationstation/stationapi/api/registry/JsonRecipeParserRegistry.java
@@ -14,9 +14,8 @@
  */
 public final class JsonRecipeParserRegistry extends SimpleRegistry<Consumer<URL>> {
 
-    private static final Consumer<URL> EMPTY = url -> {};
     public static final RegistryKey<JsonRecipeParserRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("json_recipe_parsers"));
-    public static final JsonRecipeParserRegistry INSTANCE = Registries.create(KEY, new JsonRecipeParserRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final JsonRecipeParserRegistry INSTANCE = Registries.create(KEY, new JsonRecipeParserRegistry(), Lifecycle.experimental());
 
     private JsonRecipeParserRegistry() {
         super(KEY, Lifecycle.experimental(), false);
diff --git a/station-recipes-v0/src/main/java/net/modificationstation/stationapi/api/registry/JsonRecipesRegistry.java b/station-recipes-v0/src/main/java/net/modificationstation/stationapi/api/registry/JsonRecipesRegistry.java
@@ -3,17 +3,14 @@
 import com.mojang.serialization.Lifecycle;
 
 import java.net.URL;
-import java.util.Collections;
 import java.util.Set;
 
 import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
 
 public final class JsonRecipesRegistry extends SimpleRegistry<Set<URL>> {
 
-    @SuppressWarnings("CollectionContainsUrl")
-    private static final Set<URL> EMPTY = Collections.emptySet();
     public static final RegistryKey<JsonRecipesRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("json_recipes"));
-    public static final JsonRecipesRegistry INSTANCE = Registries.create(KEY, new JsonRecipesRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final JsonRecipesRegistry INSTANCE = Registries.create(KEY, new JsonRecipesRegistry(), Lifecycle.experimental());
 
     private JsonRecipesRegistry() {
         super(KEY, Lifecycle.experimental(), false);
diff --git a/station-registry-api-v0/src/main/java/net/modificationstation/stationapi/api/registry/Registries.java b/station-registry-api-v0/src/main/java/net/modificationstation/stationapi/api/registry/Registries.java
@@ -2,65 +2,49 @@
 
 import com.mojang.serialization.Lifecycle;
 import net.modificationstation.stationapi.api.util.Identifier;
-import net.modificationstation.stationapi.api.util.Util;
 import org.apache.commons.lang3.Validate;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.Supplier;
-
-import static net.modificationstation.stationapi.api.StationAPI.LOGGER;
 import static net.modificationstation.stationapi.api.StationAPI.NAMESPACE;
 
 public class Registries {
-    private static final Map<Identifier, Supplier<?>> DEFAULT_ENTRIES = new LinkedHashMap<>();
     public static final Identifier ROOT_KEY = NAMESPACE.id("root");
     private static final MutableRegistry<MutableRegistry<?>> ROOT = new SimpleRegistry<>(RegistryKey.ofRegistry(ROOT_KEY), Lifecycle.stable());
     public static final Registry<? extends Registry<?>> REGISTRIES = ROOT;
 
-    public static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Initializer<T> initializer) {
-        return Registries.create(key, Lifecycle.stable(), initializer);
+    public static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key) {
+        return Registries.create(key, Lifecycle.stable());
     }
 
-    public static <T> DefaultedRegistry<T> create(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Initializer<T> initializer) {
-        return Registries.create(key, defaultId, Lifecycle.stable(), initializer);
+    public static <T> DefaultedRegistry<T> create(RegistryKey<? extends Registry<T>> key, Identifier defaultId) {
+        return Registries.create(key, defaultId, Lifecycle.stable());
     }
 
-    public static <T> DefaultedRegistry<T> createIntrusive(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Initializer<T> initializer) {
-        return Registries.createIntrusive(key, defaultId, Lifecycle.stable(), initializer);
+    public static <T> DefaultedRegistry<T> createIntrusive(RegistryKey<? extends Registry<T>> key, Identifier defaultId) {
+        return Registries.createIntrusive(key, defaultId, Lifecycle.stable());
     }
 
-    public static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Lifecycle lifecycle, Initializer<T> initializer) {
-        return Registries.create(key, new SimpleRegistry<>(key, lifecycle, false), initializer, lifecycle);
+    public static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Lifecycle lifecycle) {
+        return Registries.create(key, new SimpleRegistry<>(key, lifecycle, false), lifecycle);
     }
 
-    public static <T> DefaultedRegistry<T> create(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Lifecycle lifecycle, Initializer<T> initializer) {
-        return Registries.create(key, new SimpleDefaultedRegistry<>(defaultId, key, lifecycle, false), initializer, lifecycle);
+    public static <T> DefaultedRegistry<T> create(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Lifecycle lifecycle) {
+        return Registries.create(key, new SimpleDefaultedRegistry<>(defaultId, key, lifecycle, false), lifecycle);
     }
 
-    public static <T> DefaultedRegistry<T> createIntrusive(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Lifecycle lifecycle, Initializer<T> initializer) {
-        return Registries.create(key, new SimpleDefaultedRegistry<>(defaultId, key, lifecycle, true), initializer, lifecycle);
+    public static <T> DefaultedRegistry<T> createIntrusive(RegistryKey<? extends Registry<T>> key, Identifier defaultId, Lifecycle lifecycle) {
+        return Registries.create(key, new SimpleDefaultedRegistry<>(defaultId, key, lifecycle, true), lifecycle);
     }
 
-    public static <T, R extends MutableRegistry<T>> R create(RegistryKey<? extends Registry<T>> key, R registry, Initializer<T> initializer, Lifecycle lifecycle) {
-        Identifier identifier = key.getValue();
-        DEFAULT_ENTRIES.put(identifier, () -> initializer.run(registry));
+    public static <T, R extends MutableRegistry<T>> R create(RegistryKey<? extends Registry<T>> key, R registry, Lifecycle lifecycle) {
         //noinspection unchecked
         ((MutableRegistry<R>) ROOT).add((RegistryKey<R>) key, registry, lifecycle);
         return registry;
     }
 
     public static void bootstrap() {
-        Registries.init();
         Registries.validate(REGISTRIES);
     }
 
-    private static void init() {
-        DEFAULT_ENTRIES.forEach((id, initializer) -> {
-            if (initializer.get() == null) LOGGER.error("Unable to bootstrap registry '{}'", id);
-        });
-    }
-
     private static <T extends Registry<?>> void validate(Registry<T> registries) {
         registries.forEach(registry -> {
             if (registry instanceof DefaultedRegistry<?> defaultedRegistry) {
@@ -69,10 +53,5 @@ private static <T extends Registry<?>> void validate(Registry<T> registries) {
             }
         });
     }
-
-    @FunctionalInterface
-    public interface Initializer<T> {
-        T run(Registry<T> var1);
-    }
 }
 
diff --git a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/BlockModelPredicateProviderRegistry.java b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/BlockModelPredicateProviderRegistry.java
@@ -5,10 +5,10 @@
 import net.modificationstation.stationapi.api.StationAPI;
 import net.modificationstation.stationapi.api.client.event.render.model.BlockModelPredicateProviderRegistryEvent;
 import net.modificationstation.stationapi.api.client.model.block.BlockModelPredicateProvider;
-import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.registry.Registries;
 import net.modificationstation.stationapi.api.registry.RegistryKey;
 import net.modificationstation.stationapi.api.registry.SimpleRegistry;
+import net.modificationstation.stationapi.api.util.Identifier;
 import net.modificationstation.stationapi.api.util.math.MathHelper;
 
 import java.util.IdentityHashMap;
@@ -18,9 +18,8 @@
 
 public final class BlockModelPredicateProviderRegistry extends SimpleRegistry<BlockModelPredicateProvider> {
 
-    private static final BlockModelPredicateProvider EMPTY = (state, world, pos, seed) -> 0;
     public static final RegistryKey<BlockModelPredicateProviderRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("block_model_predicate_providers"));
-    public static final BlockModelPredicateProviderRegistry INSTANCE = Registries.create(KEY, new BlockModelPredicateProviderRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final BlockModelPredicateProviderRegistry INSTANCE = Registries.create(KEY, new BlockModelPredicateProviderRegistry(), Lifecycle.experimental());
 
     private static final Identifier META_ID = Identifier.of("meta");
     private static final BlockModelPredicateProvider META_PROVIDER = (state, clientWorld, pos, seed) -> clientWorld == null || pos == null ? 0 : MathHelper.clamp(clientWorld.getBlockMeta(pos.x, pos.y, pos.z), 0, 15);
diff --git a/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/ItemModelPredicateProviderRegistry.java b/station-renderer-api-v0/src/main/java/net/modificationstation/stationapi/api/client/registry/ItemModelPredicateProviderRegistry.java
@@ -18,9 +18,8 @@
 
 public final class ItemModelPredicateProviderRegistry extends SimpleRegistry<ItemModelPredicateProvider> {
 
-    private static final ItemModelPredicateProvider EMPTY = (stack, world, entity, seed) -> 0;
     public static final RegistryKey<ItemModelPredicateProviderRegistry> KEY = RegistryKey.ofRegistry(NAMESPACE.id("item_model_predicate_providers"));
-    public static final ItemModelPredicateProviderRegistry INSTANCE = Registries.create(KEY, new ItemModelPredicateProviderRegistry(), registry -> EMPTY, Lifecycle.experimental());
+    public static final ItemModelPredicateProviderRegistry INSTANCE = Registries.create(KEY, new ItemModelPredicateProviderRegistry(), Lifecycle.experimental());
 
     private static final Identifier DAMAGED_ID = Identifier.of("damaged");
     private static final Identifier DAMAGE_ID = Identifier.of("damage");

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`*/`
`19`	`19`	`@NoArgsConstructor(access = AccessLevel.PRIVATE)`
`20`	`20`	`public final class MessageListenerRegistry {`
`21`		`- private static final BiConsumer<PlayerEntity, MessagePacket> EMPTY = (player, message) -> {};`
`22`	`21`	`public static final RegistryKey<Registry<BiConsumer<PlayerEntity, MessagePacket>>> KEY = RegistryKey.ofRegistry(NAMESPACE.id("message_listeners"));`
`23`		`- public static final Registry<BiConsumer<PlayerEntity, MessagePacket>> INSTANCE = Registries.create(KEY, registry -> EMPTY);`
	`22`	`+ public static final Registry<BiConsumer<PlayerEntity, MessagePacket>> INSTANCE = Registries.create(KEY);`
`24`	`23`	`}`