create NamedRegistry, move some logic to be INamed-based (#144)

* move a number of things to INamed instead of IScriptReloadable

* move name logic to NamedRegistry

* remove now redundant info for ForgeRegistryWrapper

* simplify NamedRegistry

* make Thaumcraft Arcane Workbench use NR instead of VR

* make Vanilla stuff used NamedRegistry

* make reloading only happen once instead of every alias

* fix oredict

* make empty onReload instead use NamedRegistry

* avoid that one turkish casing bug for reviewer

Author: WaitingIdly

src/main/java/com/cleanroommc/groovyscript/api/INamed.java

@@ -13,4 +13,10 @@ default String getName() {
         }
         return aliases.iterator().next();
     }
+
+    @GroovyBlacklist
+    default boolean isEnabled() {
+        return true;
+    }
+
 }

src/main/java/com/cleanroommc/groovyscript/api/IScriptReloadable.java

@@ -12,9 +12,4 @@ public interface IScriptReloadable extends INamed {
     @ApiStatus.OverrideOnly
     void afterScriptLoad();
 
-    @GroovyBlacklist
-    default boolean isEnabled() {
-        return true;
-    }
-
 }

src/main/java/com/cleanroommc/groovyscript/compat/content/Content.java

@@ -2,6 +2,7 @@
 
 import com.cleanroommc.groovyscript.GroovyScript;
 import com.cleanroommc.groovyscript.api.GroovyLog;
+import com.cleanroommc.groovyscript.registry.NamedRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -13,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class Content {
+public class Content extends NamedRegistry {
 
     public CreativeTabs defaultTab;
 

src/main/java/com/cleanroommc/groovyscript/compat/inworldcrafting/InWorldCrafting.java

@@ -2,15 +2,13 @@
 
 import com.cleanroommc.groovyscript.api.GroovyBlacklist;
 import com.cleanroommc.groovyscript.api.IScriptReloadable;
+import com.cleanroommc.groovyscript.registry.NamedRegistry;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import java.util.Collection;
-import java.util.Collections;
-
-public class InWorldCrafting implements IScriptReloadable {
+public class InWorldCrafting extends NamedRegistry implements IScriptReloadable {
 
     public final FluidToFluid fluidToFluid = new FluidToFluid();
     public final FluidToItem fluidToItem = new FluidToItem();
@@ -41,11 +39,6 @@ public void afterScriptLoad() {
         this.pistonPush.afterScriptLoad();
     }
 
-    @Override
-    public Collection<String> getAliases() {
-        return Collections.emptyList();
-    }
-
     public static EntityItem spawnItem(World world, BlockPos pos, ItemStack item) {
         EntityItem entityItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, item);
         world.spawnEntity(entityItem);

src/main/java/com/cleanroommc/groovyscript/compat/loot/Loot.java

@@ -2,6 +2,7 @@
 
 import com.cleanroommc.groovyscript.api.GroovyBlacklist;
 import com.cleanroommc.groovyscript.api.IScriptReloadable;
+import com.cleanroommc.groovyscript.registry.NamedRegistry;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ResourceLocation;
@@ -10,11 +11,9 @@
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 
-public class Loot implements IScriptReloadable {
+public class Loot extends NamedRegistry implements IScriptReloadable {
 
     public Map<ResourceLocation, LootTable> tables = new Object2ObjectOpenHashMap<>();
 
@@ -43,8 +42,4 @@ public void afterScriptLoad() {
         }
     }
 
-    @Override
-    public Collection<String> getAliases() {
-        return Collections.emptyList();
-    }
 }

src/main/java/com/cleanroommc/groovyscript/compat/mods/ModPropertyContainer.java

@@ -11,26 +11,26 @@
 
 public class ModPropertyContainer implements IDynamicGroovyProperty {
 
-    private final Map<String, IScriptReloadable> registries;
+    private final Map<String, INamed> registries;
 
     public ModPropertyContainer() {
         this.registries = new Object2ObjectOpenHashMap<>();
         ((IVirtualizedRegistrar) this::addRegistry).addFieldsOf(this);
     }
 
-    protected void addRegistry(IScriptReloadable registry) {
+    protected void addRegistry(INamed registry) {
         for (String alias : registry.getAliases()) {
             this.registries.put(alias, registry);
         }
     }
 
-    public Collection<IScriptReloadable> getRegistries() {
+    public Collection<INamed> getRegistries() {
         return registries.values();
     }
 
     @Override
     public @Nullable Object getProperty(String name) {
-        IScriptReloadable registry = registries.get(name);
+        INamed registry = registries.get(name);
         if (registry == null) {
             GroovyLog.get().error("Attempted to access registry {}, but could not find a registry with that name", name);
             return null;

src/main/java/com/cleanroommc/groovyscript/compat/mods/aetherlegacy/Accessory.java

@@ -3,7 +3,6 @@
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import com.cleanroommc.groovyscript.api.IIngredient;
 import com.cleanroommc.groovyscript.api.documentation.annotations.*;
-import com.cleanroommc.groovyscript.helper.Alias;
 import com.cleanroommc.groovyscript.helper.EnumHelper;
 import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
 import com.cleanroommc.groovyscript.registry.ForgeRegistryWrapper;
@@ -19,7 +18,7 @@
 public class Accessory extends ForgeRegistryWrapper<AetherAccessory> {
 
     public Accessory() {
-        super(GameRegistry.findRegistry(AetherAccessory.class), Alias.generateOfClass(Accessory.class));
+        super(GameRegistry.findRegistry(AetherAccessory.class));
     }
 
     @MethodDescription(type = MethodDescription.Type.ADDITION)

src/main/java/com/cleanroommc/groovyscript/compat/mods/aetherlegacy/Enchanter.java

@@ -3,7 +3,6 @@
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import com.cleanroommc.groovyscript.api.IIngredient;
 import com.cleanroommc.groovyscript.api.documentation.annotations.*;
-import com.cleanroommc.groovyscript.helper.Alias;
 import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
 import com.cleanroommc.groovyscript.registry.ForgeRegistryWrapper;
 import com.gildedgames.the_aether.api.enchantments.AetherEnchantment;
@@ -15,7 +14,7 @@
 public class Enchanter extends ForgeRegistryWrapper<AetherEnchantment> {
 
     public Enchanter() {
-        super(GameRegistry.findRegistry(AetherEnchantment.class), Alias.generateOfClass(Enchanter.class));
+        super(GameRegistry.findRegistry(AetherEnchantment.class));
     }
 
     @RecipeBuilderDescription(example = @Example(".input(item('minecraft:clay')).output(item('minecraft:diamond')).time(200)"))

src/main/java/com/cleanroommc/groovyscript/compat/mods/aetherlegacy/EnchanterFuel.java

@@ -4,7 +4,6 @@
 import com.cleanroommc.groovyscript.api.documentation.annotations.Example;
 import com.cleanroommc.groovyscript.api.documentation.annotations.MethodDescription;
 import com.cleanroommc.groovyscript.api.documentation.annotations.RegistryDescription;
-import com.cleanroommc.groovyscript.helper.Alias;
 import com.cleanroommc.groovyscript.registry.ForgeRegistryWrapper;
 import com.gildedgames.the_aether.api.enchantments.AetherEnchantmentFuel;
 import net.minecraft.item.ItemStack;
@@ -14,7 +13,7 @@
 public class EnchanterFuel extends ForgeRegistryWrapper<AetherEnchantmentFuel> {
 
     public EnchanterFuel() {
-        super(GameRegistry.findRegistry(AetherEnchantmentFuel.class), Alias.generateOfClass(EnchanterFuel.class));
+        super(GameRegistry.findRegistry(AetherEnchantmentFuel.class));
     }
 
     @MethodDescription(type = MethodDescription.Type.ADDITION, example = @Example("item('minecraft:blaze_rod'), 1000"))

src/main/java/com/cleanroommc/groovyscript/compat/mods/aetherlegacy/Freezer.java

@@ -3,7 +3,6 @@
 import com.cleanroommc.groovyscript.api.GroovyLog;
 import com.cleanroommc.groovyscript.api.IIngredient;
 import com.cleanroommc.groovyscript.api.documentation.annotations.*;
-import com.cleanroommc.groovyscript.helper.Alias;
 import com.cleanroommc.groovyscript.helper.recipe.AbstractRecipeBuilder;
 import com.cleanroommc.groovyscript.registry.ForgeRegistryWrapper;
 import com.gildedgames.the_aether.api.freezables.AetherFreezable;
@@ -15,7 +14,7 @@
 public class Freezer extends ForgeRegistryWrapper<AetherFreezable> {
 
     public Freezer() {
-        super(GameRegistry.findRegistry(AetherFreezable.class), Alias.generateOfClass(Freezer.class));
+        super(GameRegistry.findRegistry(AetherFreezable.class));
     }
 
     @RecipeBuilderDescription(example = @Example(".input(item('minecraft:clay')).output(item('minecraft:dirt')).time(200)"))