fix some startup bugs

Author: gustovafing

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/data/worldgen/WorldGenLayers.java

@@ -1,42 +1,32 @@
 package com.gregtechceu.gtceu.api.data.worldgen;
 
-import com.gregtechceu.gtceu.GTCEu;
-import com.gregtechceu.gtceu.api.registry.GTRegistries;
-
+import com.gregtechceu.gtceu.common.registry.GTRegistration;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest;
 import net.neoforged.bus.api.IEventBus;
-import net.neoforged.neoforge.registries.DeferredRegister;
 
 import java.util.Set;
 
 public class WorldGenLayers {
 
-    private static final DeferredRegister<IWorldGenLayer> WORLD_GEN_LAYERS = DeferredRegister
-            .create(GTRegistries.Keys.WORLD_GEN_LAYER, GTCEu.MOD_ID);
 
     public static void init(IEventBus modBus) {
-        WORLD_GEN_LAYERS.register(modBus);
-        WORLD_GEN_LAYERS.register("stone", () -> STONE);
-        WORLD_GEN_LAYERS.register("deepslate", () -> DEEPSLATE);
-        WORLD_GEN_LAYERS.register("netherrack", () -> NETHERRACK);
-        WORLD_GEN_LAYERS.register("endstone", () -> ENDSTONE);
     }
 
-    public static final SimpleWorldGenLayer STONE = new SimpleWorldGenLayer(
-            GTCEu.id("stone"), () -> new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES),
+    public static final SimpleWorldGenLayer STONE = GTRegistration.REGISTRATE.simpleWorldGenLayer(
+            "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 SimpleWorldGenLayer DEEPSLATE = GTRegistration.REGISTRATE.simpleWorldGenLayer(
+            "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 SimpleWorldGenLayer NETHERRACK = GTRegistration.REGISTRATE.simpleWorldGenLayer(
+            "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 SimpleWorldGenLayer ENDSTONE = GTRegistration.REGISTRATE.simpleWorldGenLayer(
+            "endstone", () -> WorldGeneratorUtils.END_ORE_REPLACEABLES,
             Set.of(Level.END));
 }

src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java

@@ -43,12 +43,6 @@ public Stream<BlockPos> getPositions(PlacementContext context, RandomSource rand
         return positions;
     }
 
-    public static void init(IEventBus modBus) {
-        var register = DeferredRegister.create(Registries.PLACEMENT_MODIFIER_TYPE, GTCEu.MOD_ID);
-        register.register(modBus);
-        register.register("biome_placement", () -> BIOME_PLACEMENT);
-    }
-
     @Override
     public PlacementModifierType<?> type() {
         return BIOME_PLACEMENT;

src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java

@@ -161,7 +161,7 @@ public GTRecipe copy(ContentModifier modifier, boolean modifyDuration) {
 
     @Override
     public @NotNull RecipeSerializer<?> getSerializer() {
-        return recipeType.getSerializer();
+        return recipeType.getSerializer().value();
     }
 
     @Override

src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java

@@ -11,6 +11,7 @@
 import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder;
 import com.gregtechceu.gtceu.utils.FormattingUtil;
 
+import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
@@ -40,7 +41,7 @@ public class GTRecipeType implements RecipeType<GTRecipe> {
 
     @Getter
     @Setter(onMethod_ = { @ApiStatus.Internal })
-    public GTRecipeSerializer serializer;
+    public Holder<RecipeSerializer<?>> serializer;
 
     @Getter
     public final ResourceLocation registryName;
@@ -101,7 +102,7 @@ public class GTRecipeType implements RecipeType<GTRecipe> {
     public GTRecipeType(ResourceLocation registryName, String group, RecipeType<?>... proxyRecipes) {
         var registrate = GTRegistrate.createIgnoringListenerErrors(registryName.getNamespace());
         registrate.generic(registryName.getPath(), Registries.RECIPE_TYPE, () -> this).build();
-        registrate.generic(registryName.getPath(), Registries.RECIPE_SERIALIZER, GTRecipeSerializer::new).build();
+        serializer = registrate.generic(registryName.getPath(), Registries.RECIPE_SERIALIZER, GTRecipeSerializer::new).register();
 
         this.registryName = registryName;
         this.group = group;

src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java

@@ -18,6 +18,7 @@
 import com.gregtechceu.gtceu.api.machine.MetaMachine;
 import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition;
 import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
+import com.gregtechceu.gtceu.api.recipe.GTRecipeSerializer;
 import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
 import com.gregtechceu.gtceu.api.recipe.category.GTRecipeCategory;
 import com.gregtechceu.gtceu.api.registry.GTRegistries;
@@ -221,6 +222,9 @@ protected <P> NoConfigBuilder<CreativeModeTab, CreativeModeTab, P> createCreativ
     public GTRecipeType recipeType(String name, String group, RecipeType<?>... proxyRecipes) {
         var recipeType = new GTRecipeType(GTCEu.id(name), group, proxyRecipes);
         this.generic(name, GTRegistries.Keys.RECIPE_TYPE, () -> recipeType).build();
+        this.generic(name, Registries.RECIPE_TYPE, () -> recipeType).build();
+        recipeType.setSerializer(this.generic(name, Registries.RECIPE_SERIALIZER, GTRecipeSerializer::new).register());
+
         return recipeType;
     }
 
@@ -240,7 +244,7 @@ public TagPrefix tagPrefix(String name) {
 
     public TagPrefix tagPrefix(String name, boolean invertedName) {
         var tagPrefix = new TagPrefix(makeResourceLocation(name), invertedName);
-        this.generic(name.toLowerCase(), GTRegistries.Keys.TAG_PREFIX, () -> tagPrefix).register();
+        this.generic(name, GTRegistries.Keys.TAG_PREFIX, () -> tagPrefix).register();
         return tagPrefix;
     }
 

src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java

@@ -173,6 +173,7 @@ public static void init(final IEventBus modBus) {
         GTCreativeModeTabs.init();
 
         GTBlocks.init();
+        GTFluids.init();
 
         GTDimensionMarkers.init(modBus);
         GTRecipeCapabilities.init(modBus);
@@ -273,7 +274,7 @@ public static void registerMaterialContent(RegisterEvent event) {
             GTMaterialItems.generateArmors();
 
         } else if (event.getRegistryKey() == Registries.FLUID) {
-            GTFluids.init();
+            GTFluids.registerMaterialFluids();
         } else if (event.getRegistryKey() == Registries.BLOCK_ENTITY_TYPE) {
             GTBlockEntities.init();
         }

src/main/java/com/gregtechceu/gtceu/common/data/GTToolBehaviors.java

@@ -52,5 +52,7 @@ private GTToolBehaviors() {}
     public static final DeferredHolder<ToolBehaviorType<?>, ToolBehaviorType<ProspectingBehavior>> PROSPECTING = TOOL_BEHAVIOR_TYPE.register(
             "prospecting", () -> new ToolBehaviorType<>(ProspectingBehavior.CODEC, ProspectingBehavior.STREAM_CODEC));
     // spotless:on
-    public static void init(IEventBus modBus) {}
+    public static void init(IEventBus modBus) {
+        TOOL_BEHAVIOR_TYPE.register(modBus);
+    }
 }