mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

CheckedRegistry#add -> #register

Browse Source
This commit is contained in:
dfsek
2021-07-05 19:22:21 -07:00
parent d4a784ddb5
commit 9221a4f1ae
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java
View File

@@ -13,7 +13,6 @@ import com.dfsek.terra.api.event.EventListener;
import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.Structure;
@@ -41,7 +40,7 @@ public class TerraScriptAddon extends TerraAddon implements EventListener {
try {
StructureScript structureScript = new StructureScript(entry.getValue(), main, structureRegistry, lootRegistry, event.getPack().getRegistryFactory().create());
try {
structureRegistry.add(structureScript.getId(), structureScript);
structureRegistry.register(structureScript.getId(), structureScript);
} catch(DuplicateEntryException e) {
throw new LoadException("Duplicate structure: ", e);
}

4
common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
View File

@@ -10,7 +10,7 @@ public interface CheckedRegistry<T> extends Registry<T> {
* @param value Value to register.
* @throws DuplicateEntryException If an entry with the same identifier is already present.
*/
void add(String identifier, T value) throws DuplicateEntryException;
void register(String identifier, T value) throws DuplicateEntryException;
/**
* Add a value to the registry, without checking presence beforehand.
@@ -19,7 +19,7 @@ public interface CheckedRegistry<T> extends Registry<T> {
*
* @param identifier Identifier to assign value.
* @param value Value to register.
* @deprecated Use of {@link #add(String, Object)} is encouraged.
* @deprecated Use of {@link #register(String, Object)} is encouraged.
*/
@Deprecated
void addUnchecked(String identifier, T value);

2
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@@ -251,7 +251,7 @@ public class ConfigPackImpl implements ConfigPack {
for(ConfigType<?, ?> configType : configTypeRegistry.entries()) {
for(AbstractableTemplate config : abstractConfigLoader.loadConfigs(configs.getOrDefault(configType, Collections.emptyList()), () -> configType.getTemplate(this, main))) {
try {
((CheckedRegistry) getRegistry(configType.getTypeClass())).add(config.getID(), ((ConfigFactory) configType.getFactory()).build(config, main));
((CheckedRegistry) getRegistry(configType.getTypeClass())).register(config.getID(), ((ConfigFactory) configType.getFactory()).build(config, main));
} catch(DuplicateEntryException e) {
throw new LoadException("Duplicate registry entry: ", e);
}

2
common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
View File

@@ -25,7 +25,7 @@ public class CheckedRegistryImpl<T> implements CheckedRegistry<T> {
}
@Override
public void add(String identifier, T value) throws DuplicateEntryException {
public void register(String identifier, T value) throws DuplicateEntryException {
registry.registerChecked(identifier, value);
}

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java
View File

@@ -24,7 +24,7 @@ public class TerraListener implements EventListener {
for(TreeType value : TreeType.values()) {
try {
String id = BukkitAdapter.TREE_TRANSFORMER.translate(value);
event.getPack().getRegistry(Tree.class).add(id, new BukkitTree(value, main));
event.getPack().getRegistry(Tree.class).register(id, new BukkitTree(value, main));
event.getPack().getRegistry(Tree.class).get(id); // Platform trees should never be marked "dead"
} catch(DuplicateEntryException ignore) { // If another com.dfsek.terra.addon has already registered trees, do nothing.
}

4
platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
View File

@@ -359,7 +359,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
BuiltinRegistries.CONFIGURED_FEATURE.getEntries().forEach(entry -> {
if(!template.getExcludedRegistryFeatures().contains(entry.getKey().getValue())) {
try {
event.getPack().getRegistry(Tree.class).add(entry.getKey().getValue().toString(), (Tree) entry.getValue());
event.getPack().getRegistry(Tree.class).register(entry.getKey().getValue().toString(), (Tree) entry.getValue());
debugLogger.info("Injected ConfiguredFeature " + entry.getKey().getValue() + " as Tree.");
} catch(DuplicateEntryException ignored) {
}
@@ -401,7 +401,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
private void injectTree(CheckedRegistry<Tree> registry, String id, ConfiguredFeature<?, ?> tree) {
try {
registry.add(id, (Tree) tree);
registry.register(id, (Tree) tree);
} catch(DuplicateEntryException ignore) {
}
}