重命名 registrar 为 registrator

Anvil-Dev · Aug 31, 2024 · 5c21fe3 · 5c21fe3
1 parent 0a1840d
commit 5c21fe3
Show file tree

Hide file tree

Showing 18 changed files with 69 additions and 71 deletions.
diff --git a/...raft/lib/registrar/AbstractRegistrar.java → .../lib/registrator/AbstractRegistrator.java b/...raft/lib/registrar/AbstractRegistrar.java → .../lib/registrator/AbstractRegistrator.java
@@ -1,10 +1,10 @@
-package dev.anvilcraft.lib.registrar;
+package dev.anvilcraft.lib.registrator;
 
 import dev.anvilcraft.lib.data.DataProviderType;
-import dev.anvilcraft.lib.registrar.builder.EntryBuilder;
-import dev.anvilcraft.lib.registrar.builder.ItemBuilder;
-import dev.anvilcraft.lib.registrar.builder.BlockBuilder;
-import dev.anvilcraft.lib.registrar.entry.TagKeyEntry;
+import dev.anvilcraft.lib.registrator.builder.EntryBuilder;
+import dev.anvilcraft.lib.registrator.builder.ItemBuilder;
+import dev.anvilcraft.lib.registrator.builder.BlockBuilder;
+import dev.anvilcraft.lib.registrator.entry.TagKeyEntry;
 import net.minecraft.core.Registry;
 import net.minecraft.data.DataProvider;
 import net.minecraft.resources.ResourceKey;
@@ -22,12 +22,12 @@
 import java.util.function.Function;
 
 @SuppressWarnings("unused")
-public abstract class AbstractRegistrar {
+public abstract class AbstractRegistrator {
     protected final BuilderManager manager = new BuilderManager();
     protected final Map<DataProviderType<?>, Consumer<DataProvider>> dataProviders = Collections.synchronizedMap(new HashMap<>());
     private final String modid;
 
-    protected AbstractRegistrar(String modid) {
+    protected AbstractRegistrator(String modid) {
         this.modid = modid;
     }
 
@@ -66,13 +66,13 @@ public void init() {
     }
 
     @SuppressWarnings("UnusedReturnValue")
-    public <T extends DataProvider> AbstractRegistrar initDatagen(DataProviderType<T> type, Consumer<DataProvider> consumer) {
+    public <T extends DataProvider> AbstractRegistrator initDatagen(DataProviderType<T> type, Consumer<DataProvider> consumer) {
         this.dataProviders.put(type, consumer);
         return this;
     }
 
     @SuppressWarnings("UnusedReturnValue")
-    public <T> AbstractRegistrar addBuilder(Registry<T> registry, EntryBuilder<? extends T> builder) {
+    public <T> AbstractRegistrator addBuilder(Registry<T> registry, EntryBuilder<? extends T> builder) {
         this.manager.addBuilder(registry, builder);
         return this;
     }

diff --git a/...ilcraft/lib/registrar/BuilderManager.java → ...craft/lib/registrator/BuilderManager.java b/...ilcraft/lib/registrar/BuilderManager.java → ...craft/lib/registrator/BuilderManager.java
@@ -1,6 +1,6 @@
-package dev.anvilcraft.lib.registrar;
+package dev.anvilcraft.lib.registrator;
 
-import dev.anvilcraft.lib.registrar.builder.EntryBuilder;
+import dev.anvilcraft.lib.registrator.builder.EntryBuilder;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import org.jetbrains.annotations.NotNull;

diff --git a/...v/anvilcraft/lib/registrar/Registrar.java → ...vilcraft/lib/registrator/Registrator.java b/...v/anvilcraft/lib/registrar/Registrar.java → ...vilcraft/lib/registrator/Registrator.java
@@ -1,16 +1,16 @@
-package dev.anvilcraft.lib.registrar;
+package dev.anvilcraft.lib.registrator;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings("unused")
-public abstract class Registrar extends AbstractRegistrar {
-    protected Registrar(String modid) {
+public abstract class Registrator extends AbstractRegistrator {
+    protected Registrator(String modid) {
         super(modid);
     }
 
     @ExpectPlatform
-    public static @NotNull Registrar create(String modid) {
+    public static @NotNull Registrator create(String modid) {
         throw new AssertionError();
     }
 }
diff --git a/...ft/lib/registrar/ResourcePacksHelper.java → .../lib/registrator/ResourcePacksHelper.java b/...ft/lib/registrar/ResourcePacksHelper.java → .../lib/registrator/ResourcePacksHelper.java
@@ -1,4 +1,4 @@
-package dev.anvilcraft.lib.registrar;
+package dev.anvilcraft.lib.registrator;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.resources.ResourceLocation;

diff --git a/...t/lib/registrar/builder/BlockBuilder.java → ...lib/registrator/builder/BlockBuilder.java b/...t/lib/registrar/builder/BlockBuilder.java → ...lib/registrator/builder/BlockBuilder.java
@@ -1,9 +1,9 @@
-package dev.anvilcraft.lib.registrar.builder;
+package dev.anvilcraft.lib.registrator.builder;
 
 import dev.anvilcraft.lib.data.AnvilLibBlockModelProvider;
 import dev.anvilcraft.lib.data.DataProviderType;
-import dev.anvilcraft.lib.registrar.AbstractRegistrar;
-import dev.anvilcraft.lib.registrar.entry.BlockEntry;
+import dev.anvilcraft.lib.registrator.AbstractRegistrator;
+import dev.anvilcraft.lib.registrator.entry.BlockEntry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -16,7 +16,7 @@ public class BlockBuilder<T extends Block> extends EntryBuilder<T> {
     private final Function<BlockBehaviour.Properties, T> factory;
     private final BlockBehaviour.Properties properties = BlockBehaviour.Properties.of();
 
-    public BlockBuilder(AbstractRegistrar registrar, String id, Function<BlockBehaviour.Properties, T> factory) {
+    public BlockBuilder(AbstractRegistrator registrar, String id, Function<BlockBehaviour.Properties, T> factory) {
         super(registrar, id);
         this.factory = factory;
         this.entry = new BlockEntry<>(this);

diff --git a/...b/registrar/builder/BlockItemBuilder.java → ...registrator/builder/BlockItemBuilder.java b/...b/registrar/builder/BlockItemBuilder.java → ...registrator/builder/BlockItemBuilder.java
@@ -1,6 +1,6 @@
-package dev.anvilcraft.lib.registrar.builder;
+package dev.anvilcraft.lib.registrator.builder;
 
-import dev.anvilcraft.lib.registrar.AbstractRegistrar;
+import dev.anvilcraft.lib.registrator.AbstractRegistrator;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -10,7 +10,7 @@
 public class BlockItemBuilder<T extends BlockItem, B extends Block> extends ItemBuilder<T> {
     protected final BlockBuilder<B> blockBuilder;
 
-    public BlockItemBuilder(AbstractRegistrar registrar, BlockBuilder<B> builder, String id, Function<Item.Properties, T> factory) {
+    public BlockItemBuilder(AbstractRegistrator registrar, BlockBuilder<B> builder, String id, Function<Item.Properties, T> factory) {
         super(registrar, id, factory);
         this.blockBuilder = builder;
     }

diff --git a/...t/lib/registrar/builder/EntryBuilder.java → ...lib/registrator/builder/EntryBuilder.java b/...t/lib/registrar/builder/EntryBuilder.java → ...lib/registrator/builder/EntryBuilder.java
@@ -1,14 +1,14 @@
-package dev.anvilcraft.lib.registrar.builder;
+package dev.anvilcraft.lib.registrator.builder;
 
-import dev.anvilcraft.lib.registrar.AbstractRegistrar;
-import dev.anvilcraft.lib.registrar.entry.RegistryEntry;
+import dev.anvilcraft.lib.registrator.AbstractRegistrator;
+import dev.anvilcraft.lib.registrator.entry.RegistryEntry;
 import net.minecraft.resources.ResourceLocation;
 
 public abstract class EntryBuilder<T> {
-    protected final AbstractRegistrar registrar;
+    protected final AbstractRegistrator registrar;
     protected final String id;
 
-    protected EntryBuilder(AbstractRegistrar registrar, String id) {
+    protected EntryBuilder(AbstractRegistrator registrar, String id) {
         this.registrar = registrar;
         this.id = id;
     }

diff --git a/...ft/lib/registrar/builder/ItemBuilder.java → .../lib/registrator/builder/ItemBuilder.java b/...ft/lib/registrar/builder/ItemBuilder.java → .../lib/registrator/builder/ItemBuilder.java
@@ -1,10 +1,10 @@
-package dev.anvilcraft.lib.registrar.builder;
+package dev.anvilcraft.lib.registrator.builder;
 
 import dev.anvilcraft.lib.data.AnvilLibItemModelProvider;
 import dev.anvilcraft.lib.data.DataProviderType;
 import dev.anvilcraft.lib.mixin.ItemPropertiesAccessor;
-import dev.anvilcraft.lib.registrar.AbstractRegistrar;
-import dev.anvilcraft.lib.registrar.entry.ItemEntry;
+import dev.anvilcraft.lib.registrator.AbstractRegistrator;
+import dev.anvilcraft.lib.registrator.entry.ItemEntry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.data.recipes.RecipeProvider;
 import net.minecraft.tags.TagKey;
@@ -22,7 +22,7 @@ public class ItemBuilder<T extends Item> extends EntryBuilder<T> {
     private final Item.Properties properties = new Item.Properties();
     private final Function<Item.Properties, T> factory;
 
-    public ItemBuilder(AbstractRegistrar registrar, String id, Function<Item.Properties, T> factory) {
+    public ItemBuilder(AbstractRegistrator registrar, String id, Function<Item.Properties, T> factory) {
         super(registrar, id);
         this.factory = factory;
         this.entry = new ItemEntry<>(this);

diff --git a/...craft/lib/registrar/entry/BlockEntry.java → ...aft/lib/registrator/entry/BlockEntry.java b/...craft/lib/registrar/entry/BlockEntry.java → ...aft/lib/registrator/entry/BlockEntry.java
@@ -1,6 +1,6 @@
-package dev.anvilcraft.lib.registrar.entry;
+package dev.anvilcraft.lib.registrator.entry;
 
-import dev.anvilcraft.lib.registrar.builder.BlockBuilder;
+import dev.anvilcraft.lib.registrator.builder.BlockBuilder;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;

diff --git a/...lcraft/lib/registrar/entry/ItemEntry.java → ...raft/lib/registrator/entry/ItemEntry.java b/...lcraft/lib/registrar/entry/ItemEntry.java → ...raft/lib/registrator/entry/ItemEntry.java
@@ -1,6 +1,6 @@
-package dev.anvilcraft.lib.registrar.entry;
+package dev.anvilcraft.lib.registrator.entry;
 
-import dev.anvilcraft.lib.registrar.builder.ItemBuilder;
+import dev.anvilcraft.lib.registrator.builder.ItemBuilder;
 import lombok.Getter;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.ItemLike;

diff --git a/...ft/lib/registrar/entry/RegistryEntry.java → .../lib/registrator/entry/RegistryEntry.java b/...ft/lib/registrar/entry/RegistryEntry.java → .../lib/registrator/entry/RegistryEntry.java
@@ -1,4 +1,4 @@
-package dev.anvilcraft.lib.registrar.entry;
+package dev.anvilcraft.lib.registrator.entry;
 
 import java.util.function.Supplier;
 

diff --git a/...raft/lib/registrar/entry/TagKeyEntry.java → ...ft/lib/registrator/entry/TagKeyEntry.java b/...raft/lib/registrar/entry/TagKeyEntry.java → ...ft/lib/registrator/entry/TagKeyEntry.java
@@ -1,7 +1,7 @@
-package dev.anvilcraft.lib.registrar.entry;
+package dev.anvilcraft.lib.registrator.entry;
 
 import dev.anvilcraft.lib.AnvilLib;
-import dev.anvilcraft.lib.registrar.AbstractRegistrar;
+import dev.anvilcraft.lib.registrator.AbstractRegistrator;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -10,21 +10,21 @@
 
 public final class TagKeyEntry<T> extends RegistryEntry<TagKey<T>> {
     private TagKey<T> self = null;
-    private final AbstractRegistrar registrar;
+    private final AbstractRegistrator registrar;
     private final ResourceKey<? extends Registry<T>> registry;
     @NotNull
     private final String defaultPath;
     private final String forgePath;
 
-    private TagKeyEntry(AbstractRegistrar registrar, ResourceKey<? extends Registry<T>> registry, @NotNull String defaultPath, String forgePath) {
+    private TagKeyEntry(AbstractRegistrator registrar, ResourceKey<? extends Registry<T>> registry, @NotNull String defaultPath, String forgePath) {
         this.registrar = registrar;
         this.registry = registry;
         this.defaultPath = defaultPath;
         this.forgePath = forgePath;
     }
 
     @NotNull
-    public static <T> TagKeyEntry<T> create(AbstractRegistrar registrar, ResourceKey<? extends Registry<T>> registry, @NotNull String fabricPath, String forgePath) {
+    public static <T> TagKeyEntry<T> create(AbstractRegistrator registrar, ResourceKey<? extends Registry<T>> registry, @NotNull String fabricPath, String forgePath) {
         return new TagKeyEntry<>(registrar, registry, fabricPath, forgePath);
     }
 

diff --git a/...t/lib/registrar/fabric/RegistrarImpl.java → ...b/registrator/fabric/RegistratorImpl.java b/...t/lib/registrar/fabric/RegistrarImpl.java → ...b/registrator/fabric/RegistratorImpl.java
@@ -1,19 +1,19 @@
-package dev.anvilcraft.lib.registrar.fabric;
+package dev.anvilcraft.lib.registrator.fabric;
 
 import dev.anvilcraft.lib.AnvilLib;
-import dev.anvilcraft.lib.registrar.Registrar;
-import dev.anvilcraft.lib.registrar.builder.EntryBuilder;
+import dev.anvilcraft.lib.registrator.Registrator;
+import dev.anvilcraft.lib.registrator.builder.EntryBuilder;
 import net.minecraft.core.Registry;
 import org.jetbrains.annotations.NotNull;
 
-public class RegistrarImpl extends Registrar {
-    private RegistrarImpl(String modid) {
+public class RegistratorImpl extends Registrator {
+    private RegistratorImpl(String modid) {
         super(modid);
     }
 
     @NotNull
-    public static Registrar create(String modid) {
-        return new RegistrarImpl(modid);
+    public static Registrator create(String modid) {
+        return new RegistratorImpl(modid);
     }
 
     @Override

diff --git a/...strar/fabric/ResourcePacksHelperImpl.java → ...rator/fabric/ResourcePacksHelperImpl.java b/...strar/fabric/ResourcePacksHelperImpl.java → ...rator/fabric/ResourcePacksHelperImpl.java
@@ -1,6 +1,6 @@
-package dev.anvilcraft.lib.registrar.fabric;
+package dev.anvilcraft.lib.registrator.fabric;
 
-import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
+import dev.anvilcraft.lib.registrator.ResourcePacksHelper;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.loader.api.FabricLoader;

diff --git a/...ft/lib/registrar/forge/RegistrarImpl.java → ...ib/registrator/forge/RegistratorImpl.java b/...ft/lib/registrar/forge/RegistrarImpl.java → ...ib/registrator/forge/RegistratorImpl.java
@@ -1,15 +1,15 @@
-package dev.anvilcraft.lib.registrar.forge;
+package dev.anvilcraft.lib.registrator.forge;
 
 import dev.anvilcraft.lib.AnvilLib;
-import dev.anvilcraft.lib.registrar.Registrar;
-import dev.anvilcraft.lib.registrar.builder.EntryBuilder;
+import dev.anvilcraft.lib.registrator.Registrator;
+import dev.anvilcraft.lib.registrator.builder.EntryBuilder;
 import net.minecraft.core.Registry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.registries.RegisterEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class RegistrarImpl extends Registrar {
-    private RegistrarImpl(String modid) {
+public class RegistratorImpl extends Registrator {
+    private RegistratorImpl(String modid) {
         super(modid);
     }
 
@@ -36,7 +36,7 @@ private <T> void init(RegisterEvent event, Registry<T> registry) {
     }
 
     @NotNull
-    public static Registrar create(String modid) {
-        return new RegistrarImpl(modid);
+    public static Registrator create(String modid) {
+        return new RegistratorImpl(modid);
     }
 }
diff --git a/...istrar/forge/ResourcePacksHelperImpl.java → ...trator/forge/ResourcePacksHelperImpl.java b/...istrar/forge/ResourcePacksHelperImpl.java → ...trator/forge/ResourcePacksHelperImpl.java
@@ -1,12 +1,11 @@
-package dev.anvilcraft.lib.registrar.forge;
+package dev.anvilcraft.lib.registrator.forge;
 
-import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
+import dev.anvilcraft.lib.registrator.ResourcePacksHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackSource;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddPackFindersEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModList;

diff --git a/...ft/lib/registrar/forge/RegistrarImpl.java → ...ib/registrator/forge/RegistratorImpl.java b/...ft/lib/registrar/forge/RegistrarImpl.java → ...ib/registrator/forge/RegistratorImpl.java
@@ -1,15 +1,15 @@
-package dev.anvilcraft.lib.registrar.forge;
+package dev.anvilcraft.lib.registrator.forge;
 
 import dev.anvilcraft.lib.AnvilLib;
-import dev.anvilcraft.lib.registrar.Registrar;
-import dev.anvilcraft.lib.registrar.builder.EntryBuilder;
+import dev.anvilcraft.lib.registrator.Registrator;
+import dev.anvilcraft.lib.registrator.builder.EntryBuilder;
 import net.minecraft.core.Registry;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.registries.RegisterEvent;
 import org.jetbrains.annotations.NotNull;
 
-public class RegistrarImpl extends Registrar {
-    private RegistrarImpl(String modid) {
+public class RegistratorImpl extends Registrator {
+    private RegistratorImpl(String modid) {
         super(modid);
     }
 
@@ -36,7 +36,7 @@ private <T> void init(RegisterEvent event, Registry<T> registry) {
     }
 
     @NotNull
-    public static Registrar create(String modid) {
-        return new RegistrarImpl(modid);
+    public static Registrator create(String modid) {
+        return new RegistratorImpl(modid);
     }
 }
diff --git a/...istrar/forge/ResourcePacksHelperImpl.java → ...trator/forge/ResourcePacksHelperImpl.java b/...istrar/forge/ResourcePacksHelperImpl.java → ...trator/forge/ResourcePacksHelperImpl.java
@@ -1,12 +1,11 @@
-package dev.anvilcraft.lib.registrar.forge;
+package dev.anvilcraft.lib.registrator.forge;
 
-import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
+import dev.anvilcraft.lib.registrator.ResourcePacksHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.repository.PackSource;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddPackFindersEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModList;