From 9221a4f1ae556798dfb4c25fba270cc0bf808d72 Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 5 Jul 2021 19:22:21 -0700 Subject: [PATCH] CheckedRegistry#add -> #register --- .../com/dfsek/terra/addons/terrascript/TerraScriptAddon.java | 3 +-- .../java/com/dfsek/terra/api/registry/CheckedRegistry.java | 4 ++-- .../main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java | 2 +- .../java/com/dfsek/terra/registry/CheckedRegistryImpl.java | 2 +- .../java/com/dfsek/terra/bukkit/listeners/TerraListener.java | 2 +- .../main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java b/common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java index ed6726888..f5c5d98fb 100644 --- a/common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java +++ b/common/addons/terrascript/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java @@ -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); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java index 7a9d1548c..89fea3415 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java @@ -10,7 +10,7 @@ public interface CheckedRegistry extends Registry { * @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 extends Registry { * * @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); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 1604d8aa7..9618d72ac 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -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); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java index 8cdb364cb..790337235 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java @@ -25,7 +25,7 @@ public class CheckedRegistryImpl implements CheckedRegistry { } @Override - public void add(String identifier, T value) throws DuplicateEntryException { + public void register(String identifier, T value) throws DuplicateEntryException { registry.registerChecked(identifier, value); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java index 680ec2952..774f578b1 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java @@ -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. } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index 446ef3d02..fcb4d2ed0 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -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 registry, String id, ConfiguredFeature tree) { try { - registry.add(id, (Tree) tree); + registry.register(id, (Tree) tree); } catch(DuplicateEntryException ignore) { } }