-
-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move client extension registration to an event (#1311)
- Loading branch information
Showing
19 changed files
with
391 additions
and
327 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
src/main/java/net/neoforged/neoforge/client/extensions/common/ClientExtensionsManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright (c) NeoForged and contributors | ||
| * SPDX-License-Identifier: LGPL-2.1-only | ||
| */ | ||
|
|
||
| package net.neoforged.neoforge.client.extensions.common; | ||
|
|
||
| import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import net.minecraft.core.registries.BuiltInRegistries; | ||
| import net.minecraft.world.effect.MobEffect; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.neoforged.fml.ModLoader; | ||
| import net.neoforged.neoforge.data.loading.DatagenModLoader; | ||
| import net.neoforged.neoforge.fluids.FluidType; | ||
| import net.neoforged.neoforge.registries.NeoForgeRegistries; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| @ApiStatus.Internal | ||
| public final class ClientExtensionsManager { | ||
| static final Map<Block, IClientBlockExtensions> BLOCK_EXTENSIONS = new Reference2ObjectOpenHashMap<>(); | ||
| static final Map<Item, IClientItemExtensions> ITEM_EXTENSIONS = new Reference2ObjectOpenHashMap<>(); | ||
| static final Map<MobEffect, IClientMobEffectExtensions> MOB_EFFECT_EXTENSIONS = new Reference2ObjectOpenHashMap<>(); | ||
| static final Map<FluidType, IClientFluidTypeExtensions> FLUID_TYPE_EXTENSIONS = new Reference2ObjectOpenHashMap<>(); | ||
| private static boolean earlyInitialized = false; | ||
| private static boolean initialized = false; | ||
|
|
||
| private ClientExtensionsManager() {} | ||
|
|
||
| @SafeVarargs | ||
| static <T, E> void register(E extensions, Map<T, E> target, T... objects) { | ||
| if (objects.length == 0) { | ||
| throw new IllegalArgumentException("At least one target must be provided"); | ||
| } | ||
| Objects.requireNonNull(extensions, "Extensions must not be null"); | ||
|
|
||
| for (T object : objects) { | ||
| Objects.requireNonNull(objects, "Target must not be null"); | ||
| E oldExtensions = target.put(object, extensions); | ||
| if (oldExtensions != null) { | ||
| throw new IllegalStateException(String.format( | ||
| Locale.ROOT, | ||
| "Duplicate client extensions registration for %s (old: %s, new: %s)", | ||
| object, | ||
| oldExtensions, | ||
| extensions)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Deprecated(forRemoval = true, since = "1.21") | ||
| public static void earlyInit() { | ||
| // Minecraft instance isn't available in datagen, so don't initialize client extensions in datagen | ||
| if (DatagenModLoader.isRunningDataGen()) return; | ||
|
|
||
| if (earlyInitialized) { | ||
| throw new IllegalStateException("Duplicate early initialization of ClientExtensionsManager"); | ||
| } | ||
|
|
||
| earlyInitialized = true; | ||
| BuiltInRegistries.BLOCK.forEach(block -> block.initializeClient(ext -> register(ext, BLOCK_EXTENSIONS, block))); | ||
| BuiltInRegistries.ITEM.forEach(item -> item.initializeClient(ext -> register(ext, ITEM_EXTENSIONS, item))); | ||
| BuiltInRegistries.MOB_EFFECT.forEach(mobEffect -> mobEffect.initializeClient(ext -> register(ext, MOB_EFFECT_EXTENSIONS, mobEffect))); | ||
| NeoForgeRegistries.FLUID_TYPES.forEach(fluidType -> fluidType.initializeClient(ext -> register(ext, FLUID_TYPE_EXTENSIONS, fluidType))); | ||
| } | ||
|
|
||
| public static void init() { | ||
| // Minecraft instance isn't available in datagen, so don't initialize client extensions in datagen | ||
| if (DatagenModLoader.isRunningDataGen()) return; | ||
|
|
||
| if (initialized) { | ||
| throw new IllegalStateException("Duplicate initialization of ClientExtensionsManager"); | ||
| } | ||
|
|
||
| initialized = true; | ||
| ModLoader.postEvent(new RegisterClientExtensionsEvent()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.