getFromID -> getByID

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeDelegateLoader.java

@@ -24,7 +24,7 @@ public class BiomeDelegateLoader implements TypeLoader<BiomeDelegate> {
     public BiomeDelegate load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader) throws LoadException {
         if(c.equals("SELF")) return BiomeDelegate.self();
         return biomeRegistry
-                .getFromID((String) c)
+                .getByID((String) c)
                 .map(BiomeDelegate::from)
                 .orElseGet(() -> BiomeDelegate.ephemeral((String) c));
     }

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java

@@ -68,7 +68,7 @@ public class StructureFunction implements Function<Boolean> {
     
     
         String app = id.apply(implementationArguments, variableMap);
-        return registry.getFromID(app).map(script -> {
+        return registry.getByID(app).map(script -> {
             Rotation rotation1;
             String rotString = rotations.get(arguments.getRandom().nextInt(rotations.size())).apply(implementationArguments, variableMap);
             try {

common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java

@@ -79,8 +79,8 @@ public interface Registry<T> extends TypeLoader<T> {
     
     TypeKey<T> getType();
     
-    default Optional<T> getFromID(String id) {
+    default Optional<T> getByID(String id) {
-        return getFromID(id, map -> {
+        return getByID(id, map -> {
             if(map.isEmpty()) return Optional.empty();
             if(map.size() == 1) {
                 return map.values().stream().findFirst(); // only one value.
@@ -93,12 +93,12 @@ public interface Registry<T> extends TypeLoader<T> {
         });
     }
     
-    Map<RegistryKey, T> getIDMatches(String id);
+    Map<RegistryKey, T> getMatches(String id);
     
-    default Optional<T> getFromID(String attempt, Function<Map<RegistryKey, T>, Optional<T>> reduction) {
+    default Optional<T> getByID(String attempt, Function<Map<RegistryKey, T>, Optional<T>> reduction) {
         if(attempt.contains(":")) {
             return get(RegistryKey.parse(attempt));
         }
-        return reduction.apply(getIDMatches(attempt));
+        return reduction.apply(getMatches(attempt));
     }
 }

common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java

@@ -46,7 +46,7 @@ public class GenericTemplateSupplierLoader<T> implements TypeLoader<T> {
         Map<String, Object> map = (Map<String, Object>) c;
         try {
             return loader
-                    .load(registry.getFromID(((String) map.get("type")))
+                    .load(registry.getByID(((String) map.get("type")))
                                   .orElseThrow(() -> new LoadException("No such entry: " + map.get("type")))
                                   .get(), new MapConfiguration(map)).get();
         } catch(ConfigException e) {

common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java

@@ -97,8 +97,8 @@ public class CheckedRegistryImpl<T> implements CheckedRegistry<T> {
     }
     
     @Override
-    public Map<RegistryKey, T> getIDMatches(String id) {
+    public Map<RegistryKey, T> getMatches(String id) {
-        return registry.getIDMatches(id);
+        return registry.getMatches(id);
     }
     
     @Override

common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java

@@ -84,8 +84,8 @@ public class LockedRegistryImpl<T> implements Registry<T> {
     }
     
     @Override
-    public Map<RegistryKey, T> getIDMatches(String id) {
+    public Map<RegistryKey, T> getMatches(String id) {
-        return registry.getIDMatches(id);
+        return registry.getMatches(id);
     }
     
     @Override

common/implementation/base/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java

@@ -66,9 +66,9 @@ public class OpenRegistryImpl<T> implements OpenRegistry<T> {
     
     @Override
     public T load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader) throws LoadException {
-        return getFromID((String) o).orElseThrow(() -> new LoadException("No such " + type.getType().getTypeName() + " matching \"" + o +
+        return getByID((String) o).orElseThrow(() -> new LoadException("No such " + type.getType().getTypeName() + " matching \"" + o +
-                                                                         "\" was found in this registry. Registry contains items: " +
+                                                                       "\" was found in this registry. Registry contains items: " +
-                                                                         getItemsFormatted()));
+                                                                       getItemsFormatted()));
     }
     
     private String getItemsFormatted() {
@@ -144,7 +144,7 @@ public class OpenRegistryImpl<T> implements OpenRegistry<T> {
     }
     
     @Override
-    public Map<RegistryKey, T> getIDMatches(String id) {
+    public Map<RegistryKey, T> getMatches(String id) {
         return objectIDs
                 .get(id)
                 .stream()

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -214,9 +214,9 @@ public class TerraBukkitPlugin extends JavaPlugin {
     public @Nullable
     ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
         return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
-            ConfigPack pack = platform.getConfigRegistry().getIDMatches(id).orElseThrow(
+            ConfigPack pack = platform.getConfigRegistry().getByID(id).orElseThrow(
                     () -> new IllegalArgumentException("No such config pack \"" + id + "\""));
             return pack.getGeneratorProvider().newInstance(pack);
-        }), platform.getRawConfigRegistry().getIDMatches(id).orElseThrow(), platform.getWorldHandle().air());
+        }), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air());
     }
 }

platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java

@@ -22,7 +22,7 @@ public final class TerraCLI {
         CLIPlatform platform = new CLIPlatform();
         platform.getEventManager().callEvent(new PlatformInitializationEvent());
     
-        ConfigPack generate = platform.getConfigRegistry().getIDMatches("OVERWORLD").orElseThrow(); // TODO: make this a cli argument
+        ConfigPack generate = platform.getConfigRegistry().getByID("OVERWORLD").orElseThrow(); // TODO: make this a cli argument
     
         CLIWorld world = new CLIWorld(2, 2, 384, -64, generate);
         

platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java

@@ -83,7 +83,7 @@ public abstract class GeneratorOptionsMixin {
             prop = prop.substring(prop.indexOf(":") + 1);
             
             String finalProp = prop;
-            ConfigPack config = main.getConfigRegistry().getFromID(prop).orElseThrow(() -> new IllegalArgumentException(
+            ConfigPack config = main.getConfigRegistry().getByID(prop).orElseThrow(() -> new IllegalArgumentException(
                     "No such pack " + finalProp));
             
             cir.setReturnValue(