Basic ore generation for missing entries, chisel bounds, stackable mega shards, minor rks datagen fixes (#99)

* Added Mega Stone, Z-Crystal, and Meteorite Ore gen

In placed and configured features

* Register Mega Stone, Z-Crystal, Meteorite Ore

* Register Mega Stone, Z-Crystal, Meteorite Ore

* Upper and lower bounds to Chisel

If inputted size is above 5.0 or under 0.5, it will now automatically change it to the closest valid size.

* Making Mega Shards stackable

Not sure why it was made unstackable when Z ingots go to 64.

* Spelling, aspect, missing entry fixes in datagen

changed Incinium -> Incineroar, added Slowbronite line, fixed Unown blocks question and exclamation

* Update StatueEditorScreen.kt

Adjusted lower bound to 0.5

Author: Conno2429

common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/statue/StatueEditorScreen.kt

@@ -137,10 +137,7 @@ class StatueEditorScreen(val statue: StatueEntity) : Screen(Component.empty()) {
                     false
                 }
             ) { s: String ->
-                var scale = parseFloat(s)
-                if (scale <= 0) {
-                    scale = 1.0f
-                }
+                var scale = parseFloat(s).coerceIn(0.5f, 5.0f)
 
                 statue.scale = scale
                 UpdateStatuePacket.Scale(statue.id, scale).sendToServer()

common/src/main/java/generations/gg/generations/core/generationscore/common/world/feature/GenerationsConfiguredFeatures.java

@@ -78,6 +78,9 @@ public static void init() {}
     public static final ResourceKey<ConfiguredFeature<?, ?>> ORE_CRYSTAL_OVERWORLD_LARGE = registerKey("ore_crystal_overworld_large");
     public static final ResourceKey<ConfiguredFeature<?, ?>> ORE_CRYSTAL_OVERWORLD_BURIED = registerKey("ore_crystal_overworld_buried");
 
+    public static final ResourceKey<ConfiguredFeature<?, ?>> ORE_MEGASTONE = registerKey("ore_megastone");
+    public static final ResourceKey<ConfiguredFeature<?, ?>> ORE_Z_CRYSTAL = registerKey("ore_z_crystal");
+    public static final ResourceKey<ConfiguredFeature<?, ?>> ORE_METEORITE = registerKey("ore_meteorite");
 
     public static void bootStrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
         RuleTest stoneReplaceables = new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES);
@@ -107,6 +110,15 @@ public static void bootStrap(BootstapContext<ConfiguredFeature<?, ?>> context) {
         register(context, ORE_CRYSTAL_OVERWORLD_LARGE, Feature.ORE, new OreConfiguration(crystalOres, 2, 0.7F));
         register(context, ORE_CRYSTAL_OVERWORLD_BURIED, Feature.ORE, new OreConfiguration(crystalOres, 4, 1.0F));
 
+        List<OreConfiguration.TargetBlockState> megastoneOres = targetBlockState(stoneReplaceables, deepslateReplaceables, GenerationsOres.MEGASTONE_ORE_SET);
+        register(context, ORE_MEGASTONE, Feature.ORE, new OreConfiguration(megastoneOres, 3, 0.0F));
+
+        List<OreConfiguration.TargetBlockState> z_crystalOres = targetBlockState(stoneReplaceables, deepslateReplaceables, GenerationsOres.Z_CRYSTAL_ORE_SET);
+        register(context, ORE_Z_CRYSTAL, Feature.ORE, new OreConfiguration(z_crystalOres, 3, 0.0F));
+
+        List<OreConfiguration.TargetBlockState> meteoriteOres = targetBlockState(stoneReplaceables, deepslateReplaceables, GenerationsOres.METEORITE_ORE_SET);
+        register(context, ORE_METEORITE, Feature.ORE, new OreConfiguration(meteoriteOres, 3, 0.0F));
+
         register(context, POKE_BALL_LOOT, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(GenerationsUtilityBlocks.POKE_BALL_LOOT.get())));
         register(context, BEAST_BALL_LOOT, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(GenerationsUtilityBlocks.BEAST_BALL_LOOT.get())));
         register(context, CHERISH_BALL_LOOT, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(GenerationsUtilityBlocks.CHERISH_BALL_LOOT.get())));

common/src/main/java/generations/gg/generations/core/generationscore/common/world/feature/GenerationsPlacedFeatures.java

@@ -37,6 +37,10 @@ public static void init(){}
     public static final ResourceKey<PlacedFeature> ORE_CRYSTAL_OVERWORLD_LARGE = registerKey("ore_crystal_overworld_large");
     public static final ResourceKey<PlacedFeature> ORE_CRYSTAL_OVERWORLD_BURIED = registerKey("ore_crystal_overworld_buried");
 
+    public static final ResourceKey<PlacedFeature> ORE_MEGASTONE = registerKey("ore_megastone");
+    public static final ResourceKey<PlacedFeature> ORE_Z_CRYSTAL = registerKey("ore_z_crystal");
+    public static final ResourceKey<PlacedFeature> ORE_METEORITE = registerKey("ore_meteorite");
+
     public static final ResourceKey<PlacedFeature> POKE_BALL_LOOT = registerKey("poke_ball_loot");
     public static final ResourceKey<PlacedFeature> BEAST_BALL_LOOT = registerKey("beast_ball_loot");
     public static final ResourceKey<PlacedFeature> CHERISH_BALL_LOOT = registerKey("cherish_ball_loot");
@@ -96,6 +100,10 @@ public static void bootStrap(BootstapContext<PlacedFeature> context) {
         register(context, ORE_CRYSTAL_OVERWORLD_LARGE, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.ORE_CRYSTAL_OVERWORLD_LARGE), GenerationsOrePlacements.rareOrePlacement(9, HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-80), VerticalAnchor.aboveBottom(80))));
         register(context, ORE_CRYSTAL_OVERWORLD_BURIED, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.ORE_CRYSTAL_OVERWORLD_SMALL), GenerationsOrePlacements.commonOrePlacement(4, HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-80), VerticalAnchor.aboveBottom(80))));
 
+        register(context, ORE_MEGASTONE, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.ORE_MEGASTONE), GenerationsOrePlacements.rareOrePlacement(20, HeightRangePlacement.triangle(VerticalAnchor.absolute(0), VerticalAnchor.absolute(-64))));
+        register(context, ORE_Z_CRYSTAL, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.ORE_Z_CRYSTAL), GenerationsOrePlacements.rareOrePlacement(20, HeightRangePlacement.triangle(VerticalAnchor.absolute(0), VerticalAnchor.absolute(-64))));
+        register(context, ORE_METEORITE, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.ORE_METEORITE), GenerationsOrePlacements.rareOrePlacement(20, HeightRangePlacement.triangle(VerticalAnchor.absolute(0), VerticalAnchor.absolute(-64))));
+
         register(context, POKE_BALL_LOOT, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.POKE_BALL_LOOT), oceanFloorSquaredWithChance(250));
         register(context, BEAST_BALL_LOOT, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.BEAST_BALL_LOOT), oceanFloorSquaredWithChance(200));
         register(context, CHERISH_BALL_LOOT, configuredFeatureRegistryEntryLookup.getOrThrow(GenerationsConfiguredFeatures.CHERISH_BALL_LOOT), oceanFloorSquaredWithChance(200));

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt

@@ -765,7 +765,7 @@ object GenerationsItems {
     @JvmField val ULTRITE_INGOT = register("ultrite_ingot", ::Item, PLAYER_ITEMS)
     @JvmField val ULTRITE_REMNANT = register("ultrite_remnant", ::Item, PLAYER_ITEMS)
     @JvmField val DYNITE_ORE = register("dynite_ore", ::Item, PLAYER_ITEMS)
-    @JvmField val MEGASTONE_SHARD = register("mega_stone_shard", { Item(it.stacksTo(1)) }, PLAYER_ITEMS)
+    @JvmField val MEGASTONE_SHARD = register("mega_stone_shard", ::Item, PLAYER_ITEMS)
     @JvmField val KEY_STONE = register("key_stone", ::Item, PLAYER_ITEMS)
 
     @JvmField val ULTRITE_UPGRADE_SMITHING_TEMPLATE = register("ultrite_upgrade_smithing_template", { UltriteSmithingTemplateItem() }, PLAYER_ITEMS)

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/worldgen/GenerationsFabricBiomemodifiers.java

@@ -34,6 +34,11 @@ public static void generateOres() {
 
         registerUnderGroundOres(BiomeSelectors.tag(ConventionalBiomeTags.CLIMATE_COLD), GenerationsPlacedFeatures.ORE_CRYSTAL, GenerationsPlacedFeatures.ORE_CRYSTAL_BURIED);
         registerUnderGroundOres(GenerationsPlacedFeatures.ORE_CRYSTAL_OVERWORLD_SMALL, GenerationsPlacedFeatures.ORE_CRYSTAL_OVERWORLD_LARGE, GenerationsPlacedFeatures.ORE_CRYSTAL_OVERWORLD_BURIED);
+
+        registerUnderGroundOres(GenerationsPlacedFeatures.ORE_MEGASTONE);
+        registerUnderGroundOres(GenerationsPlacedFeatures.ORE_Z_CRYSTAL);
+        registerUnderGroundOres(GenerationsPlacedFeatures.ORE_METEORITE);
+        
         registerSurfaceFeatures(GenerationsPlacedFeatures.POKE_BALL_LOOT);
         registerSurfaceFeatures(GenerationsPlacedFeatures.BEAST_BALL_LOOT, BiomeSelectors.foundInTheEnd());
         registerSurfaceFeatures(GenerationsPlacedFeatures.CHERISH_BALL_LOOT, BiomeSelectors.tag(GenerationsBiomeTags.IS_FLORAL));

forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/RksRecipeProvider.java

@@ -203,6 +203,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createMegaStone(LOPUNNNITE, "lopunny", exporter);
         createMegaStone(SALAMENCITE, "salamence", exporter);
         createMegaStone(BEEDRILLITE, "beedrill", exporter);
+        createMegaStone(SLOWBRONITE, "slowbro", exporter);
 
         createZCyrstal(BUGINIUM_Z, BUG_GEM, exporter);
         createZCyrstal(DARKINIUM_Z, DARK_GEM, exporter);
@@ -226,7 +227,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createZCyrstal(ALORAICHIUM_Z, "raichu", "alolan", exporter);
         createZCyrstal(DECIDIUM_Z, "decidueye", exporter);
         createZCyrstal(EEVIUM_Z, "eevee", exporter);
-        createZCyrstal(INCINIUM_Z, "incinium", exporter);
+        createZCyrstal(INCINIUM_Z, "incineroar", exporter);
         createZCyrstal(KOMMONIUM_Z, "kommoo", exporter);
         createZCyrstal(LUNALIUM_Z, "lunala", exporter);
         createZCyrstal(LYCANIUM_Z, "lycanroc", exporter);
@@ -277,8 +278,8 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_Y, "y");
         unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_Z, "z");
 
-        unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_EXCLAMATION_MARK, "!");
-        unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_QUESTION_MARK, "?");
+        unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_EXCLAMATION_MARK, "exclamation");
+        unownBlock(exporter, GenerationsBlocks.UNOWN_BLOCK_QUESTION_MARK, "questionmark");
     }
 
     private <E> void createZCyrstal(RegistrySupplier<Item> result, String pokemon, String aspects, Consumer<FinishedRecipe> exporter) {

forge/src/main/java/generations/gg/generations/core/generationscore/forge/worldgen/GenerationsForgeBiomemodifiers.java

@@ -68,6 +68,18 @@ public static void bootstrap(BootstapContext<BiomeModifier> context) {
                 placedFeaturesLookup.getOrThrow(GenerationsPlacedFeatures.ORE_CRYSTAL_OVERWORLD_BURIED))
         );
 
+        registerUnderGroundOres(context, "add_ore_megastone_overworld", HolderSet.direct(
+                placedFeaturesLookup.getOrThrow(GenerationsPlacedFeatures.ORE_MEGASTONE))
+        );
+
+        registerUnderGroundOres(context, "add_ore_z_crystal_overworld", HolderSet.direct(
+                placedFeaturesLookup.getOrThrow(GenerationsPlacedFeatures.ORE_Z_CRYSTAL))
+        );
+
+        registerUnderGroundOres(context, "add_ore_meteorite_overworld", HolderSet.direct(
+                placedFeaturesLookup.getOrThrow(GenerationsPlacedFeatures.ORE_METEORITE))
+        );
+
         registerSurfaceFeatures(context, "add_poke_ball_loot",
                 HolderSet.direct(placedFeaturesLookup.getOrThrow(GenerationsPlacedFeatures.POKE_BALL_LOOT)));