Actually use 1.21 registries properly

docs/content/Modpacks/Changes/v9.0.0.md

@@ -0,0 +1,76 @@
+---
+title: "Version 9.0.0"
+---
+
+
+# Updating to `9.0.0`
+
+## Registration Changes
+
+GregTech content now follows proper registration standards for mc content using registries.
+
+### For KJS
+
+- Register material icon types with `GTCEuStartupEvents.materialIconType`
+
+### For addons
+
+**All content should now be registered via either your addon's registrate instance, or via a [deferred register](https://docs.neoforged.net/docs/1.21.1/concepts/registries/#deferredregister).**
+
+The `GTCEuAPI.RegisterEvent` event has been removed, as content should now use registrate or deferred registers.
+
+### Migration Regex
+
+Some helpful regexes for migration are below:
+
+##### Elements
+
+Replace `public static final Element` with `public static final RegistryEntry<Element, Element>`
+
+Replace `/= (new Element|((GTElements\.)?createAndRegister))/` with `= ADDON_REGISTRATE.element`
+
+### Content registered via registrate.
+
+The following should be registered via registrate:
+- Materials - Use `REGISTRATE.material(String name)` to access the material builder.
+- Elements - Use `REGISTRATE.element(...)` to register an element.
+- Tag prefixes - Use the following methods:
+    - `REGISTRATE.tagPrefix(String name)`
+    - `REGISTRATE.tagPrefix(String name, boolean invertedName)`
+    - `REGISTRATE.oreTagPrefix(String name, TagKey<Block> miningToolTag)`
+- Material icon sets - Use the following methods:
+    - `REGISTRATE.materialIconSet(String id)`
+    - `REGISTRATE.materialIconSet(String id, MaterialIconSet parent)`
+    - `REGISTRATE.materialIconSet(String id, @Nullable MaterialIconSet parent, boolean isRoot)`
+- Recipe types - Use `REGISTRATE.recipeType(String name, String group, RecipeType<?>... proxyRecipes)`
+- Recipe categories - Use `REGISTRATE.recipeCategory(String categoryName, GTRecipeType recipeType)`
+- World gen layers - Use `REGISTRATE.simpleWorldGenLayer(...)`
+- Medical conditions - Use `REGISTRATE.medicalCondition(...)`
+
+### Other content
+
+All other content should be registered via deferred registers.
+Content that can be registered via registrate can also be registered via deferred registers, but registrate is recommended.
+
+An exmaple of using a deferred register is shown below.
+```java
+class AddonCovers {
+
+    private static final DeferredRegistry<CoverDefinition> COVER_REGISTER = 
+            DeferredRegister.create(GTRegistries.Keys.COVER, ADDON_MOD_ID);
+
+    public static final DeferredHolder<CoverDefinition, CoverDefinition> CUSTOM_COVER = COVER_REGISTER.create("addon_custom_cover", 
+        () -> new CoverDefinition(ADDON.id("addon_custom_cover"), AddonCustomCover::new));
+
+   // The init function should be called at some point during your mod's construction (e.g. in your main mod file or mod startup file)
+   public static void init(IEventBus modBus) {
+        COVER_REGISTER.register(modBus);
+   }
+}
+
+```
+
+### Other changes
+
+- World gen layers now store their dimensions as `ResourceKey<Level>` rather than `ResourceLocation`
+- Dimension markers now store their dimension as a `ResourceKey<Level>` rather than `ResourceLocation`

docs/content/Modpacks/Examples/Parallel-Hatch-Part.md

@@ -48,7 +48,7 @@ GTCEuStartupEvents.registry("gtceu:machine", (event) => {
                 GTMachineModels.createWorkableTieredHullMachineModel(
                     GTCEu.id("block/machines/parallel_hatch_mk4") // (6)
                 )[
-                    "andThen(com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder$ModelInitializer)"
+                    "andThen(com.gregtechceu.gtceu.api.registry.registrate.builder.MachineBuilder$ModelInitializer)"
                     ]((ctx, prov, model) => {
                   model.addReplaceableTextures("bottom", "top", "side");
                 })

docs/content/Modpacks/Other-Topics/Ambiguous-Methods.md

@@ -18,9 +18,9 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
 
 you'd get the error:
 ```
-Error in 'GTCEuStartupEvents.registry': The choice of Java method com.gregtechceu.gtceu.api.registry.registrate.MultiblockMachineBuilder.tooltips matching JavaScript argument types (net.minecraft.network.chat.MutableComponent) is ambiguous; candidate methods are: 
-    class com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder tooltips(java.util.List)
-    class com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder tooltips(net.minecraft.network.chat.Component[])
+Error in 'GTCEuStartupEvents.registry': The choice of Java method com.gregtechceu.gtceu.api.registry.registrate.builder.MultiblockMachineBuilder.tooltips matching JavaScript argument types (net.minecraft.network.chat.MutableComponent) is ambiguous; candidate methods are: 
+    class com.gregtechceu.gtceu.api.registry.registrate.builder.MachineBuilder tooltips(java.util.List)
+    class com.gregtechceu.gtceu.api.registry.registrate.builder.MachineBuilder tooltips(net.minecraft.network.chat.Component[])
 ```
 
 In this case, there's ambiguity between the following 2 java functions:

src/generated/resources/data/gtceu/gtceu/ore_vein/naquadah.json

@@ -23,7 +23,7 @@
         },
         "min_y": 10,
         "spread": {
-            "targets": "gtceu:plutonium_239"
+            "targets": "gtceu:plutonium"
         },
         "top": {
             "layers": 2,

src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java

@@ -17,23 +17,6 @@ public interface IGTAddon {
      */
     GTRegistrate getRegistrate();
 
-    /**
-     * This runs after GTCEu has set up it's content. Set up GT loading-dependent (but NOT ones dependent on
-     *
-     * @apiNote DO NOT REGISTER ANY OF YOUR OWN CONTENT HERE, AS IF YOU DO, IT'LL REGISTER AS IF GTCEu REGISTERED IT
-     *          AND YOUR DATAGEN AND EVENTS WILL <b><i>NOT</i></b> WORK AS EXPECTED, IF AT ALL.
-     */
-    void gtInitComplete();
-
-    /**
-     * Call init on your custom IWorldGenLayer class(es) here
-     *
-     * @deprecated Subscribe to the {@code GTCEuAPI.RegisterEvent<ResourceLocation, IWorldGenLayer>} register event
-     *             instead
-     */
-    @Deprecated(forRemoval = true, since = "8.0.0")
-    default void registerWorldgenLayers() {}
-
     /**
      * Call init on your custom VeinGenerator class(es) here
      */

src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java

@@ -13,6 +13,8 @@
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.Tag;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
@@ -75,7 +77,7 @@ public static Codec<List<Content>> contentCodec(RecipeCapability<?> capability)
      */
     public T copyInner(T content) {
         RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(Unpooled.buffer(),
-                GTRegistries.builtinRegistry(), ConnectionType.NEOFORGE);
+                RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY), ConnectionType.NEOFORGE);
         serializer.toNetwork(buf, content);
         return serializer.fromNetwork(buf);
     }
@@ -194,7 +196,7 @@ public boolean isTickSlot(int index, IO io, GTRecipe recipe) {
     private static DataResult<Holder.Reference<RecipeCapability<?>>> safeReference(Holder<RecipeCapability<?>> value) {
         return value.getDelegate() instanceof Holder.Reference<RecipeCapability<?>> reference ?
                 DataResult.success(reference) : DataResult.error(
-                        () -> "Unregistered holder in " + GTRegistries.RECIPE_CAPABILITY_REGISTRY + ": " + value);
+                        () -> "Unregistered holder in " + GTRegistries.Keys.RECIPE_CAPABILITY + ": " + value);
     }
 
     /**

src/main/java/com/gregtechceu/gtceu/api/cover/CoverDefinition.java

@@ -3,6 +3,7 @@
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.capability.ICoverable;
 import com.gregtechceu.gtceu.client.renderer.cover.ICoverRenderer;
+import com.gregtechceu.gtceu.client.renderer.cover.SimpleCoverRenderer;
 
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
@@ -30,6 +31,10 @@ public interface TieredCoverBehaviourProvider {
     @Getter
     private final @Nullable Supplier<ICoverRenderer> coverRenderer;
 
+    public CoverDefinition(ResourceLocation id, CoverBehaviourProvider behaviorCreator) {
+        this(id, behaviorCreator, () -> () -> new SimpleCoverRenderer(id.withPath("block/cover/" + id.getPath())));
+    }
+
     public CoverDefinition(ResourceLocation id, CoverBehaviourProvider behaviorCreator,
                            Supplier<Supplier<ICoverRenderer>> coverRenderer) {
         this.behaviorCreator = behaviorCreator;

src/main/java/com/gregtechceu/gtceu/api/cover/filter/FilterHandler.java

@@ -139,7 +139,8 @@ private void loadFilterFromItem() {
                     cover.coverHolder instanceof MachineCoverContainer mcc) {
                 var machine = MetaMachine.getMachine(mcc.getLevel(), mcc.getBlockPos());
                 if (machine != null) {
-                    smart.setModeFromMachine(machine.getDefinition().getName());
+                    // TODO make this use machines' definitions or full IDs?
+                    smart.setModeFromMachine(machine.getDefinition().getId().getPath());
                 }
             }
             this.onFilterLoaded.accept(this.filter);

src/main/java/com/gregtechceu/gtceu/api/data/DimensionMarker.java

@@ -5,9 +5,11 @@
 
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.Level;
 
 import lombok.Getter;
 import org.jetbrains.annotations.Nullable;
@@ -18,6 +20,9 @@ public class DimensionMarker {
 
     public static final int MAX_TIER = 99;
 
+    @Getter
+    public final ResourceKey<Level> dimension;
+
     @Getter
     public final int tier; // not only used to represent dimension tier, but also for sorting
 
@@ -26,7 +31,9 @@ public class DimensionMarker {
 
     private final MemoizedSupplier<ItemStack> iconSupplier;
 
-    public DimensionMarker(int tier, Supplier<? extends ItemLike> supplier, @Nullable Component overrideName) {
+    public DimensionMarker(ResourceKey<Level> dim, int tier, Supplier<? extends ItemLike> supplier,
+                           @Nullable Component overrideName) {
+        this.dimension = dim;
         this.tier = tier;
         this.overrideName = overrideName;
         this.iconSupplier = GTMemoizer.memoize(() -> getStack(supplier.get().asItem()));

src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/MarkerMaterial.java

@@ -1,5 +1,7 @@
 package com.gregtechceu.gtceu.api.data.chemical.material;
 
+import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate;
+
 import net.minecraft.resources.ResourceLocation;
 
 /**
@@ -21,7 +23,7 @@ public MarkerMaterial(ResourceLocation resourceLocation) {
     }
 
     @Override
-    protected void registerMaterial() {}
+    protected void registerMaterial(GTRegistrate registrate) {}
 
     @Override
     public void verifyMaterial() {}