Datagen fixed...Like always the eventual fix is emrbassingly simple.

Waterpicker · Waterpicker · commit 7deb46462b51 · 2025-06-26T16:16:31.000-05:00
diff --git a/common/src/main/generated/resources/assets/generations_core/blockstates/machine_block.json b/common/src/main/generated/resources/assets/generations_core/blockstates/machine_block.json
diff --git a/common/src/main/generated/resources/assets/generations_core/lang/en_us.json b/common/src/main/generated/resources/assets/generations_core/lang/en_us.json
@@ -643,7 +643,6 @@
   "block.generations_core.lure_ball_loot": "Lure Ball Loot",
   "block.generations_core.luxury_ball_display": "Luxury Ball Display",
   "block.generations_core.luxury_ball_loot": "Luxury Ball Loot",
-  "block.generations_core.machine_block": "Machine Block",
   "block.generations_core.magenta_couch_arm_left": "Magenta Couch Arm Left",
   "block.generations_core.magenta_couch_arm_right": "Magenta Couch Arm Right",
   "block.generations_core.magenta_couch_corner_left": "Magenta Couch Corner Left",
diff --git a/common/src/main/generated/resources/assets/generations_core/models/block/machine_block.json b/common/src/main/generated/resources/assets/generations_core/models/block/machine_block.json
diff --git a/common/src/main/generated/resources/assets/generations_core/models/item/machine_block.json b/common/src/main/generated/resources/assets/generations_core/models/item/machine_block.json
diff --git a/common/src/main/generated/resources/data/generations_core/advancement/recipes/building_blocks/machine_block.json b/common/src/main/generated/resources/data/generations_core/advancement/recipes/building_blocks/machine_block.json
diff --git a/common/src/main/generated/resources/data/generations_core/loot_table/blocks/machine_block.json b/common/src/main/generated/resources/data/generations_core/loot_table/blocks/machine_block.json
diff --git a/common/src/main/generated/resources/data/generations_core/recipe/machine_block.json b/common/src/main/generated/resources/data/generations_core/recipe/machine_block.json
diff --git a/common/src/main/generated/resources/data/generations_core/tags/item/generationsitems.json b/common/src/main/generated/resources/data/generations_core/tags/item/generationsitems.json
@@ -439,7 +439,6 @@
     "generations_core:dusk_ball_display",
     "generations_core:fast_ball_display",
     "generations_core:friend_ball_display",
-    "generations_core:heal_ball_display",
     "generations_core:heavy_ball_display",
     "generations_core:level_ball_display",
     "generations_core:love_ball_display",
@@ -455,6 +454,7 @@
     "generations_core:safari_ball_display",
     "generations_core:sport_ball_display",
     "generations_core:timer_ball_display",
+    "generations_core:heal_ball_display",
     "generations_core:cooking_pot",
     "generations_core:table_pc",
     "generations_core:rotom_pc",
diff --git a/common/src/main/generated/resources/data/minecraft/tags/block/doors.json b/common/src/main/generated/resources/data/minecraft/tags/block/doors.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "generations_core:pokecenter_door"
+  ]
+}
diff --git a/common/src/main/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -522,7 +522,6 @@
     "generations_core:bright_sandstone_slab",
     "generations_core:bright_sandstone_stairs",
     "generations_core:bright_sandstone_wall",
-    "generations_core:machine_block",
     "generations_core:ocean_block",
     "generations_core:ocean_block_slab",
     "generations_core:ocean_block_stairs",
@@ -846,7 +845,6 @@
     "generations_core:dusk_ball_display",
     "generations_core:fast_ball_display",
     "generations_core:friend_ball_display",
-    "generations_core:heal_ball_display",
     "generations_core:heavy_ball_display",
     "generations_core:level_ball_display",
     "generations_core:love_ball_display",
@@ -861,6 +859,7 @@
     "generations_core:repeat_ball_display",
     "generations_core:safari_ball_display",
     "generations_core:sport_ball_display",
-    "generations_core:timer_ball_display"
+    "generations_core:timer_ball_display",
+    "generations_core:heal_ball_display"
   ]
 }
diff --git a/common/src/main/generated/resources/data/minecraft/tags/block/mineable/shovel.json b/common/src/main/generated/resources/data/minecraft/tags/block/mineable/shovel.json
@@ -1,5 +1,8 @@
 {
   "values": [
+    "generations_core:ultra_sand",
+    "generations_core:golden_temple_sand",
+    "generations_core:ruins_sand",
     "generations_core:ruins_sand",
     "generations_core:rich_soil_1",
     "generations_core:rich_soil_2",
diff --git a/common/src/main/generated/resources/data/minecraft/tags/block/sand.json b/common/src/main/generated/resources/data/minecraft/tags/block/sand.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "generations_core:ultra_sand",
+    "generations_core:golden_temple_sand",
+    "generations_core:ruins_sand"
+  ]
+}
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PlatformRegistry.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PlatformRegistry.kt
@@ -5,11 +5,12 @@ import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
+import java.util.HashMap
 
 abstract class PlatformRegistry<T>(registryKey: ResourceKey<Registry<T>>, registry: Registry<T>) {
     val register: EntryRegister<T> = GenerationsCore.implementation.entryRegister(registry, registryKey)
 
-        protected val queue = hashMapOf<ResourceLocation, Holder<T>>()
+        protected val queue = mutableListOf<Holder<T>>()
 
         /**
          * Creates a new entry in this registry.
@@ -19,7 +20,7 @@ abstract class PlatformRegistry<T>(registryKey: ResourceKey<Registry<T>>, regist
          * @param entry The entry being added.
          * @return The entry created.
          */
-        open fun <V: T> create(name: String, entry: () -> V): Holder<V> = register.holder(name, entry)
+        open fun <V: T> create(name: String, entry: () -> V): Holder<V> = register.holder(name, entry).also { queue.add(it as Holder<T>) }
 
         /**
          * Handles the registration of this registry into the platform specific one.
@@ -30,7 +31,7 @@ abstract class PlatformRegistry<T>(registryKey: ResourceKey<Registry<T>>, regist
             this.queue
         }
 
-    open fun allHolders(): Collection<Holder<T>> = this.queue.values.toList()
+    open fun allHolders(): Collection<Holder<T>> = this.queue.toList()
 
 
     /**
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsShrines.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsShrines.kt
@@ -63,7 +63,7 @@ object GenerationsShrines: BlockPlatformRegistry() {
             }
         })
     @JvmField val LUNAR_SHRINE = registerBlockItem("lunar_shrine", { LunarShrineBlock(SHRINE_PROPERTIES) })
-    @JvmField val LIGHT_CRYSTAL = registerBlockItem("light_crystal", { LunarCystalBlock(BlockBehaviour.Properties.of(), GenerationsBlockEntityModels.LIGHT_CRYSTAL) })
+    @JvmField val LIGHT_CRYSTAL = registerBlockItem("light_crystal", { LunarCystalBlock(BlockBehaviour.Properties.of(), GenerationsBlockEntityModels.LIGHT_CRYSTAL) }, )
     @JvmField val DARK_CRYSTAL = registerBlockItem("dark_crystal", { LunarCystalBlock(BlockBehaviour.Properties.of(), GenerationsBlockEntityModels.DARK_CRYSTAL) }, ::DarkCrystalItem)
 
     @JvmField val MELOETTA_MUSIC_BOX = registerBlockItem("meloetta_music_box", { MeloettaMusicBoxBlock(SHRINE_PROPERTIES) })
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.kt
@@ -325,7 +325,7 @@ class BlockDatagen(provider: GenerationsBlockStateProvider) : GenerationsBlockSt
             GenerationsBlocks.ULTRA_CUT_SANDSTONE_SLAB.asValue()
         )
         registerBlockItem(GenerationsBlocks.GHOST_LANTERN.asValue())
-        registerBlockItem(GenerationsBlocks.MACHINE_BLOCK.asValue())
+//        registerBlockItem(GenerationsBlocks.MACHINE_BLOCK.asValue())
         registerBlockItem(GenerationsBlocks.RUINS_SAND.asValue())
         registerBlockItem(GenerationsBlocks.BURST_TURF.asValue())
 
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/items/ItemDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/items/ItemDatagen.kt
@@ -417,6 +417,7 @@ class ItemDatagen(packOutput: PackOutput, existingFileHelper: ExistingFileHelper
         createItem(GenerationsItems.DRAGON_STONE, "legend_items/")
         createItem(GenerationsItems.DARK_SOUL, "legend_items/")
         createItem(GenerationsItems.DRAGON_SOUL, "legend_items/")
+        createItem(GenerationsShrines.DARK_CRYSTAL, "legend_items/")
         //        createItem(GenerationsItems.MELODY_FLUTE, "legend_items/");
         createItem(GenerationsItems.SPARKLING_SHARD, "legend_items/")
         createItem(GenerationsItems.SPARKLING_STONE, "legend_items/")
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/GenerationsBlockLoot.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/GenerationsBlockLoot.kt
@@ -25,6 +25,7 @@ import com.cobblemon.mod.common.CobblemonItems.SAFARI_BALL
 import com.cobblemon.mod.common.CobblemonItems.SPORT_BALL
 import com.cobblemon.mod.common.CobblemonItems.TIMER_BALL
 import com.cobblemon.mod.common.CobblemonItems.ULTRA_BALL
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import generations.gg.generations.core.generationscore.common.world.level.block.*
 import generations.gg.generations.core.generationscore.common.world.level.block.generic.GenericRotatableModelBlock
@@ -75,14 +76,13 @@ internal class GenerationsBlockLoot(provider: HolderLookup.Provider) : BlockLoot
         GenerationsWood.WOOD_BLOCKS.all().forEach(::dropSelfUpdated)
 
         GenerationsBlocks.ULTRA_BLOCKS.all().forEach(::dropSelfUpdated)
-        //createDoubleDyedBlock(GenerationsUtilityBlocks.PC, PCBlock.HALF, DoubleBlockHalf.LOWER);
-        //createDyedBlock(GenerationsUtilityBlocks.CLOCK);
+        //createDoubleDTck(GenerationsUtilityBlocks.CLOCK);
         //createDyedBlock(GenerationsDecorationBlocks.UMBRELLA);
         //createDyedBlock(GenerationsDecorationBlocks.PASTEL_BEAN_BAG);
         //createDyedBlock(GenerationsDecorationBlocks.VENDING_MACHINE);
         //GenerationsDecorationBlocks.VENDING_MACHINE_BLOCKS.getEntries().stream().map(RegistryObject::get).forEach(block -> add(block, createSinglePropConditionTable(block, DoubleDyeableBlock.HALF, DoubleBlockHalf.LOWER)));
         GenerationsPokeDolls.all().forEach(::dropSelf)
-        BlockDatagen.dropSelfList.stream().map { block -> block as Block }.forEach(this::dropSelf)
+        BlockDatagen.dropSelfList.mapNotNull { block -> block.instanceOrNull<Holder<Block>>()?.value() ?: block.instanceOrNull<Block>() }.forEach(this::dropSelf)
         dropSelf(GenerationsShrines.DARK_CRYSTAL)
         dropSelf(GenerationsShrines.LIGHT_CRYSTAL)
         BlockDatagen.MUSHROOM_BLOCKS.forEach(Consumer { block: GenerationsMushroomBlock ->
@@ -151,7 +151,7 @@ internal class GenerationsBlockLoot(provider: HolderLookup.Provider) : BlockLoot
         //Ultra Space
         dropSelf(GenerationsBlocks.ULTRA_SAND)
         dropWhenSilkTouch(GenerationsBlocks.GHOST_LANTERN.value())
-        add(GenerationsBlocks.MACHINE_BLOCK.value(), createSingleItemTable(GenerationsBlocks.MACHINE_BLOCK.value()))
+//        add(GenerationsBlocks.MACHINE_BLOCK.value(), createSingleItemTable(GenerationsBlocks.MACHINE_BLOCK.value()))
         dropSelf(GenerationsBlocks.RUINS_SAND)
         dropSelf(GenerationsBlocks.RICH_SOIL_1)
         dropSelf(GenerationsBlocks.RICH_SOIL_2)
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/BuildingBlockRecipeDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/recipe/BuildingBlockRecipeDatagen.kt
@@ -737,14 +737,14 @@ class BuildingBlockRecipeDatagen(output: PackOutput, registries: CompletableFutu
         }
 
         // Machine Block
-        recipeOutput.shaped(RecipeCategory.BUILDING_BLOCKS, GenerationsBlocks.MACHINE_BLOCK) {
-            define('X', Blocks.SMOOTH_STONE)
-            define('Y', Items.REDSTONE)
-            pattern("XXX")
-            pattern("XYX")
-            pattern("XXX")
-            unlockedByItem(Blocks.SMOOTH_STONE)
-        }
+//        recipeOutput.shaped(RecipeCategory.BUILDING_BLOCKS, GenerationsBlocks.MACHINE_BLOCK) {
+//            define('X', Blocks.SMOOTH_STONE)
+//            define('Y', Items.REDSTONE)
+//            pattern("XXX")
+//            pattern("XYX")
+//            pattern("XXX")
+//            unlockedByItem(Blocks.SMOOTH_STONE)
+//        }
 
         // Ruins Sand
         recipeOutput.shapeless(RecipeCategory.BUILDING_BLOCKS, GenerationsBlocks.RUINS_SAND, count = 4) {
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/tags/TagsDatagen.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/tags/TagsDatagen.kt
@@ -45,8 +45,7 @@ object TagsDatagen {
         output: PackOutput,
         lookupProvider: CompletableFuture<HolderLookup.Provider>,
         existingFileHelper: ExistingFileHelper,
-    ) :
-        BlockTagsProvider(output, lookupProvider, GenerationsCore.MOD_ID, existingFileHelper) {
+    ) : BlockTagsProvider(output, lookupProvider, GenerationsCore.MOD_ID, existingFileHelper) {
         override fun addTags(arg: HolderLookup.Provider) {
             GenerationsBlocks.BLOCKS.all().forEach { `object` ->
                 val block = `object`

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "values": [
 +    "generations_core:pokecenter_door"
 +  ]
 +}