From 888e9e8defd739fcca73735d5130e238aeee3318 Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 5 Jul 2021 19:20:47 -0700 Subject: [PATCH] Registry#add -> #register --- .../java/com/dfsek/terra/api/registry/CheckedRegistry.java | 4 ++-- .../java/com/dfsek/terra/api/registry/OpenRegistry.java | 6 +++--- .../java/com/dfsek/terra/config/pack/ConfigPackImpl.java | 3 +-- .../java/com/dfsek/terra/config/pack/WorldConfigImpl.java | 2 +- .../java/com/dfsek/terra/registry/CheckedRegistryImpl.java | 2 +- .../java/com/dfsek/terra/registry/OpenRegistryImpl.java | 4 ++-- .../java/com/dfsek/terra/registry/master/AddonRegistry.java | 6 +++--- .../com/dfsek/terra/registry/master/ConfigRegistry.java | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) 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 a5631c7d5..7a9d1548c 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 @@ -7,7 +7,7 @@ public interface CheckedRegistry extends Registry { * Add a value to this registry, checking whether it is present first. * * @param identifier Identifier to assign value. - * @param value Value to add. + * @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; @@ -18,7 +18,7 @@ public interface CheckedRegistry extends Registry { * Use of this method is generally discouraged, as it is bad practice to overwrite registry values. * * @param identifier Identifier to assign value. - * @param value Value to add. + * @param value Value to register. * @deprecated Use of {@link #add(String, Object)} is encouraged. */ @Deprecated diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java index 739712afc..9182cd39e 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java @@ -7,15 +7,15 @@ public interface OpenRegistry extends Registry { * Add a value to this registry. * * @param identifier Identifier to assign value. - * @param value Value to add. + * @param value Value to register. */ - boolean add(String identifier, T value); + boolean register(String identifier, T value); /** * Add a value to this registry, checking whether it is present first. * * @param identifier Identifier to assign value. - * @param value Value to add. + * @param value Value to register. * @throws DuplicateEntryException If an entry with the same identifier is already present. */ void addChecked(String identifier, T value) throws DuplicateEntryException; 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 fd842cd45..1604d8aa7 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 @@ -30,7 +30,6 @@ import com.dfsek.terra.api.util.generic.pair.ImmutablePair; import com.dfsek.terra.api.util.seeded.NoiseProvider; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.dummy.DummyWorld; import com.dfsek.terra.config.fileloaders.FolderLoader; import com.dfsek.terra.config.fileloaders.ZIPLoader; @@ -231,7 +230,7 @@ public class ConfigPackImpl implements ConfigPack { @SuppressWarnings({"unchecked", "rawtypes"}) private void load(long start, TerraPlugin main) throws ConfigException { - configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.add(pair.getLeft(), pair.getRight()))); + configTypes.values().forEach(list -> list.forEach(pair -> configTypeRegistry.register(pair.getLeft(), pair.getRight()))); for(Map.Entry var : template.getVariables().entrySet()) { varScope.create(var.getKey(), var.getValue()); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java index 5754ea379..1b425652d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java @@ -34,7 +34,7 @@ public class WorldConfigImpl implements WorldConfig { pack.getRegistryMap().forEach((clazz, pair) -> registryMap.put(clazz, new LockedRegistryImpl<>(pair.getLeft()))); OpenRegistry biomeOpenRegistry = new OpenRegistryImpl<>(); - pack.getRegistry(BiomeBuilder.class).forEach((id, biome) -> biomeOpenRegistry.add(id, biome.apply(world.getWorld().getSeed()))); + pack.getRegistry(BiomeBuilder.class).forEach((id, biome) -> biomeOpenRegistry.register(id, biome.apply(world.getWorld().getSeed()))); registryMap.put(TerraBiome.class, new LockedRegistryImpl<>(biomeOpenRegistry)); this.provider = pack.getBiomeProviderBuilder().build(world.getWorld().getSeed()); 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 dbddd8976..03a2cae03 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 @@ -32,7 +32,7 @@ public class CheckedRegistryImpl implements CheckedRegistry { @Override @Deprecated public void addUnchecked(String identifier, T value) { - registry.add(identifier, value); + registry.register(identifier, value); } @Override diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java index 78a6ec7f9..def8824b9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java @@ -41,7 +41,7 @@ public class OpenRegistryImpl implements OpenRegistry { } @Override - public boolean add(String identifier, T value) { + public boolean register(String identifier, T value) { return add(identifier, new Entry<>(value)); } @@ -55,7 +55,7 @@ public class OpenRegistryImpl implements OpenRegistry { public void addChecked(String identifier, T value) throws DuplicateEntryException { if(objects.containsKey(identifier)) throw new DuplicateEntryException("Value with identifier \"" + identifier + "\" is already defined in registry."); - add(identifier, value); + register(identifier, value); } @Override diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index a96e6b0a5..7502002ab 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -27,15 +27,15 @@ public class AddonRegistry extends OpenRegistryImpl { public AddonRegistry(TerraAddon addon, TerraPlugin main) { this.main = main; - add(addon.getName(), addon); + register(addon.getName(), addon); } @Override - public boolean add(String identifier, TerraAddon addon) { + public boolean register(String identifier, TerraAddon addon) { if(contains(identifier)) throw new IllegalArgumentException("Addon " + identifier + " is already registered."); addon.initialize(); main.logger().info("Loaded com.dfsek.terra.addon " + addon.getName() + " v" + addon.getVersion() + ", by " + addon.getAuthor()); - return super.add(identifier, addon); + return super.register(identifier, addon); } @Override diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java index 2285c8ba7..d5e3c7be2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java @@ -16,7 +16,7 @@ import java.util.zip.ZipFile; public class ConfigRegistry extends OpenRegistryImpl { public void load(File folder, TerraPlugin main) throws ConfigException { ConfigPack pack = new ConfigPackImpl(folder, main); - add(pack.getID(), pack); + register(pack.getID(), pack); } public boolean loadAll(TerraPlugin main) { @@ -45,6 +45,6 @@ public class ConfigRegistry extends OpenRegistryImpl { public void load(ZipFile file, TerraPlugin main) throws ConfigException { ConfigPackImpl pack = new ConfigPackImpl(file, main); - add(pack.getTemplate().getID(), pack); + register(pack.getTemplate().getID(), pack); } }