Use holders for GT content registration on 1.21

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

@@ -75,7 +75,7 @@ title: "Custom Parallel Hatch"
                     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/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java

@@ -17,14 +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 VeinGenerator class(es) here
      */

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

@@ -1,6 +1,5 @@
 package com.gregtechceu.gtceu.api.capability.recipe;
 
-import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.trait.notifiable.NotifiableRecipeHandlerTrait;
 import com.gregtechceu.gtceu.api.recipe.GTRecipe;
@@ -63,15 +62,6 @@ protected RecipeCapability(ResourceLocation id, int color, boolean doRenderSlot,
         this.serializer = serializer;
     }
 
-    /**
-     * @deprecated Use {@link #RecipeCapability(ResourceLocation, int, boolean, int, IContentSerializer)}
-     */
-    @Deprecated(forRemoval = true, since = "8.0.0")
-    protected RecipeCapability(String name, int color, boolean doRenderSlot, int sortIndex,
-                               IContentSerializer<T> serializer) {
-        this(GTCEu.id(name), color, doRenderSlot, sortIndex, serializer);
-    }
-
     public static Codec<List<Content>> contentCodec(RecipeCapability<?> capability) {
         return Content.codec(capability).listOf().xmap(ArrayList::new, Function.identity());
     }

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

@@ -22,6 +22,7 @@
 import com.gregtechceu.gtceu.utils.GTMath;
 import com.gregtechceu.gtceu.utils.TagUtil;
 
+import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceKey;
@@ -1488,7 +1489,7 @@ public Builder radioactiveHazard(float multiplier) {
          * @param trigger   The trigger type for this hazard.
          * @param condition The condition applied by this hazard.
          */
-        public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition condition) {
+        public Builder hazard(HazardProperty.HazardTrigger trigger, Holder<MedicalCondition> condition) {
             properties.setProperty(PropertyKey.HAZARD, new HazardProperty(trigger, condition, 1, false));
             return this;
         }
@@ -1504,7 +1505,7 @@ public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition con
          * @param condition             The condition applied by this hazard.
          * @param progressionMultiplier Multiplier for how quickly the condition will progress.
          */
-        public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition condition,
+        public Builder hazard(HazardProperty.HazardTrigger trigger, Holder<MedicalCondition> condition,
                               float progressionMultiplier) {
             properties.setProperty(PropertyKey.HAZARD,
                     new HazardProperty(trigger, condition, progressionMultiplier, false));
@@ -1521,7 +1522,7 @@ public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition con
          * @param applyToDerivatives    Whether the Hazard should be applied to materials with this Material in its
          *                              components list.
          */
-        public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition condition,
+        public Builder hazard(HazardProperty.HazardTrigger trigger, Holder<MedicalCondition> condition,
                               float progressionMultiplier, boolean applyToDerivatives) {
             properties.setProperty(PropertyKey.HAZARD,
                     new HazardProperty(trigger, condition, progressionMultiplier, applyToDerivatives));
@@ -1540,7 +1541,7 @@ public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition con
          * @param applyToDerivatives Whether the Hazard should be applied to materials with this Material in its
          *                           components list.
          */
-        public Builder hazard(HazardProperty.HazardTrigger trigger, MedicalCondition condition,
+        public Builder hazard(HazardProperty.HazardTrigger trigger, Holder<MedicalCondition> condition,
                               boolean applyToDerivatives) {
             properties.setProperty(PropertyKey.HAZARD, new HazardProperty(trigger, condition, 1, applyToDerivatives));
             return this;

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

@@ -11,6 +11,7 @@
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 
+import net.minecraft.core.Holder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.StringRepresentable;
@@ -31,12 +32,12 @@
 
 public class HazardProperty implements IMaterialProperty {
 
-    public final MedicalCondition condition;
+    public final Holder<MedicalCondition> condition;
     public final HazardTrigger hazardTrigger;
     public final boolean applyToDerivatives;
     public final float progressionMultiplier;
 
-    public HazardProperty(HazardTrigger hazardTrigger, MedicalCondition condition, float progressionMultiplier,
+    public HazardProperty(HazardTrigger hazardTrigger, Holder<MedicalCondition> condition, float progressionMultiplier,
                           boolean applyToDerivatives) {
         this.hazardTrigger = hazardTrigger;
         this.condition = condition;

src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/MedicalCondition.java

@@ -12,9 +12,7 @@
 import net.minecraft.world.damagesource.DamageType;
 
 import lombok.Getter;
-import lombok.Setter;
 import lombok.experimental.Accessors;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -47,13 +45,11 @@ public class MedicalCondition {
      * condition.
      */
     @Getter
-    @Setter
-    @NotNull
-    public Consumer<GTRecipeBuilder> recipeModifier = builder -> {};
+    public final Consumer<GTRecipeBuilder> recipeModifier;
 
     public MedicalCondition(ResourceLocation id, int color,
                             int maxProgression, IdleProgressionType progressionType, float progressionRate,
-                            boolean canBePermanent,
+                            boolean canBePermanent, Consumer<GTRecipeBuilder> recipeModifier,
                             Symptom.ConfiguredSymptom... symptoms) {
         this.id = id;
         this.color = color;
@@ -67,6 +63,14 @@ public MedicalCondition(ResourceLocation id, int color,
         this.idleProgressionType = progressionType;
         this.idleProgressionRate = progressionRate;
         this.canBePermanent = canBePermanent;
+        this.recipeModifier = recipeModifier;
+    }
+
+    public MedicalCondition(ResourceLocation id, int color,
+                            int maxProgression, IdleProgressionType progressionType, float progressionRate,
+                            boolean canBePermanent,
+                            Symptom.ConfiguredSymptom... symptoms) {
+        this(id, color, maxProgression, progressionType, progressionRate, canBePermanent, $ -> {}, symptoms);
     }
 
     public ResourceKey<DamageType> getDamageType() {

src/main/java/com/gregtechceu/gtceu/api/data/worldgen/GTOreDefinition.java

@@ -177,6 +177,10 @@ public GTOreDefinition layer(IWorldGenLayer layer) {
         return this;
     }
 
+    public GTOreDefinition layer(Holder<IWorldGenLayer> layer) {
+        return layer(layer.value());
+    }
+
     public GTOreDefinition dimensions(Set<ResourceKey<Level>> dimensions) {
         this.dimensionFilter = dimensions;
         return this;

src/main/java/com/gregtechceu/gtceu/api/data/worldgen/SimpleWorldGenLayer.java

@@ -1,7 +1,5 @@
 package com.gregtechceu.gtceu.api.data.worldgen;
 
-import com.gregtechceu.gtceu.api.registry.GTRegistries;
-
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
@@ -25,8 +23,6 @@ public SimpleWorldGenLayer(ResourceLocation id, IWorldGenLayer.RuleTestSupplier
         this.id = id;
         this.target = target;
         this.levels = levels;
-
-        GTRegistries.register(GTRegistries.WORLD_GEN_LAYERS, id, this);
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/api/data/worldgen/WorldGenLayers.java

@@ -1,9 +1,11 @@
 package com.gregtechceu.gtceu.api.data.worldgen;
 
 import com.gregtechceu.gtceu.GTCEu;
-import com.gregtechceu.gtceu.integration.kjs.GTCEuStartupEvents;
-import com.gregtechceu.gtceu.integration.kjs.events.WorldGenLayerEventJS;
+import com.gregtechceu.gtceu.api.registry.GTRegistries;
+import com.gregtechceu.gtceu.common.registry.GTRegistration;
 
+import net.minecraft.core.Holder;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
@@ -12,32 +14,27 @@
 
 public class WorldGenLayers {
 
-    public static final SimpleWorldGenLayer STONE = new SimpleWorldGenLayer(
-            GTCEu.id("stone"), () -> new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES),
+    public static final Holder<IWorldGenLayer> STONE = register("stone",
+            () -> new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES),
             Set.of(Level.OVERWORLD));
 
-    public static final SimpleWorldGenLayer DEEPSLATE = new SimpleWorldGenLayer(
-            GTCEu.id("deepslate"), () -> new TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES),
+    public static final Holder<IWorldGenLayer> DEEPSLATE = register("deepslate",
+            () -> new TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES),
             Set.of(Level.OVERWORLD));
 
-    public static final SimpleWorldGenLayer NETHERRACK = new SimpleWorldGenLayer(
-            GTCEu.id("netherrack"), () -> new TagMatchTest(BlockTags.NETHER_CARVER_REPLACEABLES),
+    public static final Holder<IWorldGenLayer> NETHERRACK = register("netherrack",
+            () -> new TagMatchTest(BlockTags.NETHER_CARVER_REPLACEABLES),
             Set.of(Level.NETHER));
 
-    public static final SimpleWorldGenLayer ENDSTONE = new SimpleWorldGenLayer(
-            GTCEu.id("endstone"), () -> WorldGeneratorUtils.END_ORE_REPLACEABLES,
+    public static final Holder<IWorldGenLayer> ENDSTONE = register("endstone",
+            () -> WorldGeneratorUtils.END_ORE_REPLACEABLES,
             Set.of(Level.END));
 
-    public static void init() {
-        if (GTCEu.Mods.isKubeJSLoaded()) {
-            KJSCallWrapper.postEvent();
-        }
+    private static Holder<IWorldGenLayer> register(String name, IWorldGenLayer.RuleTestSupplier target,
+                                                   Set<ResourceKey<Level>> levels) {
+        return GTRegistration.REGISTRATE.simple(name, GTRegistries.Keys.WORLD_GEN_LAYER,
+                () -> new SimpleWorldGenLayer(GTCEu.id(name), target, levels));
     }
 
-    private static final class KJSCallWrapper {
-
-        private static void postEvent() {
-            GTCEuStartupEvents.WORLD_GEN_LAYERS.post(new WorldGenLayerEventJS());
-        }
-    }
+    public static void init() {}
 }

src/main/java/com/gregtechceu/gtceu/api/events/ModifyMachineEvent.java

@@ -1,6 +1,6 @@
 package com.gregtechceu.gtceu.api.events;
 
-import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder;
+import com.gregtechceu.gtceu.api.registry.registrate.builder.MachineBuilder;
 
 import net.neoforged.bus.api.Event;
 import net.neoforged.fml.event.IModBusEvent;

src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java

@@ -89,7 +89,7 @@ public interface IGTTool extends IUIHolder<PlayerInventoryGuiData<?>>, ItemLike
     IGTToolDefinition getToolStats();
 
     @Nullable
-    SoundEntry getSound();
+    Holder<SoundEntry> getSound();
 
     boolean playSoundOnBlockDestroy();
 
@@ -283,7 +283,7 @@ default int getTotalHarvestLevel() {
             return;
         }
         if (!areaOfEffectBlockBreakRoutine(stack, serverPlayer, pos)) {
-            var behavior = getBehaviorsComponent(stack).getBehavior(GTToolBehaviors.TREE_FELLING);
+            var behavior = getBehaviorsComponent(stack).getBehavior(GTToolBehaviors.TREE_FELLING.value());
             if (behavior != null && behavior.isEnabled() && state.is(BlockTags.LOGS)) {
                 TreeFellingHelper.fellTree(stack, player.level(), state, pos, player);
             }
@@ -723,7 +723,7 @@ default boolean canPlaySound(ItemStack stack) {
 
     default void playSound(Player player) {
         if (ConfigHolder.INSTANCE.client.toolUseSounds && getSound() != null) {
-            player.level().playSound(null, player, getSound().getMainEvent(), SoundSource.PLAYERS, 1F, 1F);
+            player.level().playSound(null, player, getSound().value().getMainEvent(), SoundSource.PLAYERS, 1F, 1F);
         }
     }
 

src/main/java/com/gregtechceu/gtceu/api/item/armor/ArmorUtils.java

@@ -130,7 +130,7 @@ public static void playJetpackSound(@NotNull Player player) {
                 cons -= 0.4F;
             }
 
-            player.playSound(GTSoundEntries.JET_ENGINE.getMainEvent(), 0.3F, cons);
+            player.playSound(GTSoundEntries.JET_ENGINE.value().getMainEvent(), 0.3F, cons);
         }
     }
 

src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolItem.java

@@ -108,7 +108,7 @@ public boolean isElectric() {
 
     @Nullable
     @Override
-    public SoundEntry getSound() {
+    public Holder<SoundEntry> getSound() {
         return toolType.soundEntry;
     }
 

src/main/java/com/gregtechceu/gtceu/api/item/tool/GTToolType.java

@@ -11,6 +11,7 @@
 import com.gregtechceu.gtceu.common.item.tool.behavior.*;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 
+import net.minecraft.core.Holder;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -198,7 +199,7 @@ public class GTToolType {
             .definition(b -> b.blockBreaking().crafting()
                     .attackDamage(2.0F).attackSpeed(-2.4F)
                     .sneakBypassUse().behaviors(RotateRailBehavior.INSTANCE))
-            .sound(new ExistingSoundEntry(SoundEvents.ITEM_BREAK, SoundSource.BLOCKS), true)
+            .sound(Holder.direct(new ExistingSoundEntry(SoundEvents.ITEM_BREAK, SoundSource.BLOCKS)), true)
             .symbol('c')
             .defaultAbilities(GTItemAbilities.CROWBAR_DIG, GTItemAbilities.CROWBAR_REMOVE_COVER)
             .materialAmount(3 * GTValues.M / 2)
@@ -571,7 +572,7 @@ public class GTToolType {
     public final Set<String> toolClassNames;
     public final Set<GTToolType> toolClasses;
     @Nullable
-    public final SoundEntry soundEntry;
+    public final Holder<SoundEntry> soundEntry;
     public final boolean playSoundOnBlockDestroy;
     public final char symbol;
     public final long materialAmount;
@@ -585,7 +586,7 @@ public GTToolType(String name, String idFormat, char symbol,
                       List<TagKey<Item>> itemTags, List<TagKey<Item>> matchTags, List<TagKey<Item>> craftingTags,
                       List<TagKey<Block>> harvestTags, Set<ItemAbility> defaultAbilities,
                       Set<String> toolClassNames, ResourceLocation modelLocation,
-                      @Nullable SoundEntry soundEntry, boolean playSoundOnBlockDestroy,
+                      @Nullable Holder<SoundEntry> soundEntry, boolean playSoundOnBlockDestroy,
                       int electricTier, long materialAmount) {
         this.name = name;
         this.idFormat = idFormat;
@@ -661,7 +662,7 @@ public static class Builder {
         private ToolConstructor constructor = GTToolItem::new;
         @Setter
         private ResourceLocation modelLocation;
-        private SoundEntry sound;
+        private Holder<SoundEntry> sound;
         private boolean playSoundOnBlockDestroy;
 
         public Builder(String name) {
@@ -727,11 +728,11 @@ public Builder definition(UnaryOperator<ToolDefinitionBuilder> builder) {
             return this;
         }
 
-        public Builder sound(SoundEntry sound) {
+        public Builder sound(Holder<SoundEntry> sound) {
             return this.sound(sound, false);
         }
 
-        public Builder sound(SoundEntry sound, boolean playSoundOnBlockDestroy) {
+        public Builder sound(Holder<SoundEntry> sound, boolean playSoundOnBlockDestroy) {
             this.sound = sound;
             this.playSoundOnBlockDestroy = playSoundOnBlockDestroy;
             return this;

src/main/java/com/gregtechceu/gtceu/api/item/tool/ToolHelper.java

@@ -212,7 +212,7 @@ public static void damageItem(ItemStack stack, @Nullable LivingEntity user, int
 
     public static void playToolSound(@Nullable GTToolType toolType, ServerPlayer player) {
         if (toolType != null && toolType.soundEntry != null) {
-            toolType.soundEntry.playOnServer(player.level(), player.blockPosition());
+            toolType.soundEntry.value().playOnServer(player.level(), player.blockPosition());
         }
     }
 
@@ -563,7 +563,7 @@ public static void onActionDone(@Nullable Player player, ItemStack stack, Level
         IGTTool tool = (IGTTool) stack.getItem();
         ToolHelper.damageItem(stack, player);
         if (tool.getSound() != null) {
-            level.playSound(player, pos.x, pos.y, pos.z, tool.getSound().getMainEvent(),
+            level.playSound(player, pos.x, pos.y, pos.z, tool.getSound().value().getMainEvent(),
                     SoundSource.PLAYERS, 1.0F, 1.0F);
         }
     }

src/main/java/com/gregtechceu/gtceu/api/item/tool/TreeFellingHelper.java

@@ -91,7 +91,7 @@ public static void onWorldTick(LevelTickEvent.Pre event) {
                 if (event.getLevel() == helper.player.level()) {
                     ItemStack held = helper.player.getMainHandItem();
                     if (helper.player.isRemoved() || helper.orderedBlocks.isEmpty() || helper.tool.isEmpty() ||
-                            !getBehaviorsComponent(held).hasBehavior(GTToolBehaviors.TREE_FELLING)) {
+                            !getBehaviorsComponent(held).hasBehavior(GTToolBehaviors.TREE_FELLING.value())) {
                         iterator.remove();
                         continue;
                     }