mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 19:59:42 +00:00
Forge 1.19.3
Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider Provided access to lookupProvider for datagen Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 Added a test mod for the new CreativeModeTabEvent Throws better error message for Forge registries in tag datagen Deleted ForgeRegistryTagsProvider Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes Added patches for both sign related methods in ModelLayers Changed RegisterShadersEvent to use ResourceProvider Migrated old Mojang math types to JOML Co-authored-by: Marc Hermans <[email protected]> Co-authored-by: LexManos <[email protected]> Co-authored-by: sciwhiz12 <[email protected]> Co-authored-by: coehlrich <[email protected]>
This commit is contained in:
1 parent
617ecb7ad3
commit
8255d7aed3
726 files changed
+7615
-6653
No files matched your search
@@ -6,20 +6,18 @@
|
||||
package net.minecraftforge.registries;
|
||||
|
||||
import com.mojang.logging.LogUtils;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.data.BuiltinRegistries;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.event.IModBusEvent;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.MappedRegistry;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
import net.minecraftforge.fml.event.IModBusEvent;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
/**
|
||||
* Register new registries when you receive this event through {@link RegistryBuilder} and {@link #create(RegistryBuilder)}.
|
||||
@@ -58,11 +56,15 @@ public class NewRegistryEvent extends Event implements IModBusEvent
|
||||
return registryHolder;
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
void fill()
|
||||
{
|
||||
RuntimeException aggregate = new RuntimeException();
|
||||
Map<RegistryBuilder<?>, IForgeRegistry<?>> builtRegistries = new IdentityHashMap<>();
|
||||
|
||||
if (BuiltInRegistries.REGISTRY instanceof MappedRegistry<?> rootRegistry)
|
||||
rootRegistry.unfreeze();
|
||||
|
||||
for (RegistryData<?> data : this.registries)
|
||||
{
|
||||
try {
|
||||
@@ -74,6 +76,9 @@ public class NewRegistryEvent extends Event implements IModBusEvent
|
||||
}
|
||||
}
|
||||
|
||||
if (BuiltInRegistries.REGISTRY instanceof MappedRegistry<?> rootRegistry)
|
||||
rootRegistry.freeze();
|
||||
|
||||
if (aggregate.getSuppressed().length > 0)
|
||||
LOGGER.error(LogUtils.FATAL_MARKER, "Failed to create some forge registries, see suppressed exceptions for details", aggregate);
|
||||
}
|
||||
@@ -85,16 +90,7 @@ public class NewRegistryEvent extends Event implements IModBusEvent
|
||||
|
||||
builtRegistries.put(builder, registry);
|
||||
|
||||
RegistryAccess.RegistryData<?> dataPackRegistryData = builder.getDataPackRegistryData();
|
||||
if (dataPackRegistryData != null) // if this is a datapack registry
|
||||
{
|
||||
if (!BuiltinRegistries.REGISTRY.containsKey(registry.getRegistryName()))
|
||||
{
|
||||
DataPackRegistriesHooks.addRegistryCodec(dataPackRegistryData);
|
||||
RegistryManager.registerToBuiltinRegistry((ForgeRegistry<?>) registry);
|
||||
}
|
||||
}
|
||||
else if (builder.getHasWrapper() && !Registry.REGISTRY.containsKey(registry.getRegistryName()))
|
||||
if (builder.getHasWrapper() && !BuiltInRegistries.REGISTRY.containsKey(registry.getRegistryName()))
|
||||
RegistryManager.registerToRootRegistry((ForgeRegistry<?>) registry);
|
||||
|
||||
data.registryHolder.registry = registry;
|
||||
|
||||
Reference in new issue
Block a user