imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-27 19:47:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

[ci skip] Add defaultId to RegistrarBuilder (#474)

Browse Source 
* Add defaultId to RegistrarBuilder

* Make the default key an registrar option

---------

Co-authored-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
Josiah Glosson
2024-02-06 02:32:35 -06:00
committed by GitHub
parent b26347a026
commit a333232d85
3 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/src/main/java/dev/architectury/registry/registries/options/DefaultIdRegistrarOption.java Normal file
View File

@@ -0,0 +1,25 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.registry.registries.options;
import net.minecraft.resources.ResourceLocation;
public record DefaultIdRegistrarOption(ResourceLocation defaultId) implements RegistrarOption {
}

24
fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistriesImpl.java
View File

@@ -28,6 +28,7 @@ import dev.architectury.registry.registries.Registrar;
import dev.architectury.registry.registries.RegistrarBuilder;
import dev.architectury.registry.registries.Registries;
import dev.architectury.registry.registries.RegistrySupplier;
import dev.architectury.registry.registries.options.DefaultIdRegistrarOption;
import dev.architectury.registry.registries.options.RegistrarOption;
import dev.architectury.registry.registries.options.StandardRegistrarOption;
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
@@ -91,7 +92,7 @@ public class RegistriesImpl {
@Override
public <T> RegistrarBuilder<T> builder(Class<T> type, ResourceLocation registryId) {
return new RegistrarBuilderWrapper<>(modId, FabricRegistryBuilder.createSimple(type, registryId));
return new RegistrarBuilderWrapper<>(modId, type, registryId);
}
}
@@ -120,24 +121,35 @@ public class RegistriesImpl {
public static class RegistrarBuilderWrapper<T> implements RegistrarBuilder<T> {
private final String modId;
private FabricRegistryBuilder<T, MappedRegistry<T>> builder;
private final Class<T> type;
private final ResourceLocation registryId;
private final List<Consumer<FabricRegistryBuilder<T, ? extends MappedRegistry<T>>>> apply = new ArrayList<>();
@Nullable
private ResourceLocation defaultId;
public RegistrarBuilderWrapper(String modId, FabricRegistryBuilder<T, MappedRegistry<T>> builder) {
public RegistrarBuilderWrapper(String modId, Class<T> type, ResourceLocation registryId) {
this.modId = modId;
this.builder = builder;
this.type = type;
this.registryId = registryId;
}
@Override
public Registrar<T> build() {
final var builder = defaultId == null
? FabricRegistryBuilder.createSimple(type, registryId)
: FabricRegistryBuilder.createDefaulted(type, registryId, defaultId);
apply.forEach(consumer -> consumer.accept(builder));
return Registries.get(modId).get(builder.buildAndRegister());
}
@Override
public RegistrarBuilder<T> option(RegistrarOption option) {
if (option == StandardRegistrarOption.SAVE_TO_DISC) {
this.builder.attribute(RegistryAttribute.PERSISTED);
this.apply.add(builder -> builder.attribute(RegistryAttribute.PERSISTED));
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
this.builder.attribute(RegistryAttribute.SYNCED);
this.apply.add(builder -> builder.attribute(RegistryAttribute.SYNCED));
} else if (option instanceof DefaultIdRegistrarOption opt) {
this.defaultId = opt.defaultId();
}
return this;
}

3
forge/src/main/java/dev/architectury/registry/registries/forge/RegistriesImpl.java
View File

@@ -28,6 +28,7 @@ import dev.architectury.registry.registries.Registrar;
import dev.architectury.registry.registries.RegistrarBuilder;
import dev.architectury.registry.registries.Registries;
import dev.architectury.registry.registries.RegistrySupplier;
import dev.architectury.registry.registries.options.DefaultIdRegistrarOption;
import dev.architectury.registry.registries.options.RegistrarOption;
import dev.architectury.registry.registries.options.StandardRegistrarOption;
import net.minecraft.core.Registry;
@@ -306,6 +307,8 @@ public class RegistriesImpl {
this.saveToDisk = true;
} else if (option == StandardRegistrarOption.SYNC_TO_CLIENTS) {
this.syncToClients = true;
} else if (option instanceof DefaultIdRegistrarOption opt) {
this.builder.setDefaultKey(opt.defaultId());
}
return this;
}