improved world gen for 1.20.1 (#112)

RealYusufIsmail-Mc-Mods · Sep 3, 2023 · f7d36c2 · f7d36c2
1 parent c323b8a
commit f7d36c2
Show file tree

Hide file tree

Showing 21 changed files with 246 additions and 196 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.20.1-1.0.2]  - 2023-9-3
+
+### Improved worlgen
+
 ## [1.20.1-1.0.1] - 2023-8-30
 
 ### Added amethyst tools.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Armour and Tools Mod
-![Long Term Support](https://img.shields.io/badge/Long_Term_Support-1.19.4-green)
-![Short Term Support](https://img.shields.io/badge/Short_Term_Support-1.20.1-green)
+![Long Term Support](https://img.shields.io/badge/Long_Term_Support-1.20.1-green)
+![Short Term Support](https://img.shields.io/badge/Short_Term_Support-1.19.4-green)
 [![](http://cf.way2muchnoise.eu/480779.svg)](https://www.curseforge.com/minecraft/mc-mods/armour-and-items-mod)
 [![](http://cf.way2muchnoise.eu/versions/480779.svg)](https://www.curseforge.com/minecraft/mc-mods/armour-and-items-mod)
 [![License: Apache License](https://img.shields.io/badge/License-Apache_License-blue.svg)](https://opensource.org/licenses/Apache-2.0)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 
 project.group = "io.github.realyusufismail"
 
-project.version = "1.20.1-1.0.1"
+project.version = "1.20.1-1.0.2"
 
 base.archivesName.set("armourandtoolsmod")
 

diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,13 +1,13 @@
-// 1.20.1	2023-08-28T05:16:02.6283281	Registries
-dff220c6252072f47de109d9b043436b066ac2bd data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json
-7c90240b4f84b84a5e0e4afd9f48d16d655236a7 data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json
-5c862835bad5b578878f8c5e3329d0326c14be59 data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json
-823f07ee2f8283861d91c55861d7afed75ef296d data/armourandtoolsmod/worldgen/configured_feature/rainbow_ore.json
-335f86fd803d6396b194ec4ee84cae932de1444d data/armourandtoolsmod/worldgen/configured_feature/ruby_ore.json
-1dc46b76902ac7f09671de5c38770d262cff1da7 data/armourandtoolsmod/worldgen/configured_feature/sapphire_ore.json
-08a77d00c1c44908fd3d8dad274657cbee9def41 data/armourandtoolsmod/worldgen/placed_feature/aqumarine_ore.json
-9090d341fcc02fe1967f84afb9b817be6b349fa2 data/armourandtoolsmod/worldgen/placed_feature/enderite_ore.json
-1c4d086a91063ea79abe970d015f6857f024654d data/armourandtoolsmod/worldgen/placed_feature/graphite_ore.json
-17e52da381098508af265bf7cac32a88a9a014a5 data/armourandtoolsmod/worldgen/placed_feature/rainbow_ore.json
+// 1.20.1	2023-09-03T09:44:53.454996	Registries
+8ebeb9bcc133ba172a3775d0e796bc03967d305e data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json
+efcff90a0c2ce2de5ad73b08e38af0880ff404de data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json
+b77f5a337f5557cc75c6aa6e358f59b658ba914c data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json
+b6141dbad16c493a2dd3da977a099762593c0ce1 data/armourandtoolsmod/worldgen/configured_feature/rainbow_ore.json
+3057438b0a0e49c8fa64f17eca031307d1247594 data/armourandtoolsmod/worldgen/configured_feature/ruby_ore.json
+ae5ee97a8e0db56c8b686c63d73efad162974df7 data/armourandtoolsmod/worldgen/configured_feature/sapphire_ore.json
+f27642c578ca288c102d5a06421fcd879102fd7a data/armourandtoolsmod/worldgen/placed_feature/aqumarine_ore.json
+a0c79f9bf1ba7248cab71480bb71041682400cdd data/armourandtoolsmod/worldgen/placed_feature/enderite_ore.json
+65608a650f79607aeb96f0ad3ed9a099f59aec67 data/armourandtoolsmod/worldgen/placed_feature/graphite_ore.json
+c784f4c858f7b80fcc27ca88c8f80774bfa35b23 data/armourandtoolsmod/worldgen/placed_feature/rainbow_ore.json
 7bb425cc1128f1c7cce61f9ef23b30e7bf3b3331 data/armourandtoolsmod/worldgen/placed_feature/ruby_ore.json
-8bf13772a1d018ab66fbb68e9bbd8401a67a6495 data/armourandtoolsmod/worldgen/placed_feature/sapphire_ore.json
+ed58618a3af3d63c835c2a5dccff501b8272f323 data/armourandtoolsmod/worldgen/placed_feature/sapphire_ore.json
diff --git a/...generated/resources/data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json b/...generated/resources/data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json
@@ -2,7 +2,7 @@
   "type": "minecraft:ore",
   "config": {
     "discard_chance_on_air_exposure": 0.0,
-    "size": 2,
+    "size": 4,
     "targets": [
       {
         "state": {
@@ -15,7 +15,7 @@
       },
       {
         "state": {
-          "Name": "armourandtoolsmod:graphite_ore"
+          "Name": "armourandtoolsmod:deepslate_aqumarine_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json
@@ -2,7 +2,7 @@
   "type": "minecraft:ore",
   "config": {
     "discard_chance_on_air_exposure": 0.0,
-    "size": 2,
+    "size": 4,
     "targets": [
       {
         "state": {

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json
@@ -2,7 +2,7 @@
   "type": "minecraft:ore",
   "config": {
     "discard_chance_on_air_exposure": 0.0,
-    "size": 6,
+    "size": 4,
     "targets": [
       {
         "state": {
@@ -15,7 +15,7 @@
       },
       {
         "state": {
-          "Name": "armourandtoolsmod:aqumarine_ore"
+          "Name": "armourandtoolsmod:deepslate_graphite_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/rainbow_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/rainbow_ore.json
@@ -2,7 +2,7 @@
   "type": "minecraft:ore",
   "config": {
     "discard_chance_on_air_exposure": 0.0,
-    "size": 2,
+    "size": 3,
     "targets": [
       {
         "state": {
@@ -18,7 +18,7 @@
       },
       {
         "state": {
-          "Name": "armourandtoolsmod:rainbow_ore",
+          "Name": "armourandtoolsmod:deepslate_rainbow_ore",
           "Properties": {
             "lit": "false"
           }

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/ruby_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/ruby_ore.json
@@ -2,7 +2,7 @@
   "type": "minecraft:ore",
   "config": {
     "discard_chance_on_air_exposure": 0.0,
-    "size": 6,
+    "size": 4,
     "targets": [
       {
         "state": {
@@ -18,7 +18,10 @@
       },
       {
         "state": {
-          "Name": "armourandtoolsmod:sapphire_ore"
+          "Name": "armourandtoolsmod:deepslate_ruby_ore",
+          "Properties": {
+            "lit": "false"
+          }
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/sapphire_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/configured_feature/sapphire_ore.json
@@ -15,10 +15,7 @@
       },
       {
         "state": {
-          "Name": "armourandtoolsmod:ruby_ore",
-          "Properties": {
-            "lit": "false"
-          }
+          "Name": "armourandtoolsmod:deepslate_sapphire_ore"
         },
         "target": {
           "predicate_type": "minecraft:tag_match",

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/aqumarine_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/aqumarine_ore.json
@@ -13,7 +13,7 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "absolute": -20
+          "absolute": 40
         },
         "min_inclusive": {
           "absolute": -64

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/enderite_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/enderite_ore.json
@@ -13,10 +13,10 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "absolute": 32
+          "absolute": 40
         },
         "min_inclusive": {
-          "absolute": 2
+          "absolute": -64
         }
       }
     },

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/graphite_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/graphite_ore.json
@@ -13,7 +13,7 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "absolute": 10
+          "absolute": 30
         },
         "min_inclusive": {
           "absolute": -64

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/rainbow_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/rainbow_ore.json
@@ -13,7 +13,7 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "absolute": -20
+          "absolute": 40
         },
         "min_inclusive": {
           "absolute": -64

diff --git a/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/sapphire_ore.json b/src/generated/resources/data/armourandtoolsmod/worldgen/placed_feature/sapphire_ore.json
@@ -13,7 +13,7 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "absolute": 10
+          "absolute": 20
         },
         "min_inclusive": {
           "absolute": -64

diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/DataGenerators.kt
@@ -27,7 +27,7 @@ import io.github.realyusufismail.armourandtoolsmod.datagen.tags.ModBlockTagsProv
 import io.github.realyusufismail.armourandtoolsmod.datagen.tags.ModItemTagsProvider
 import io.github.realyusufismail.armourandtoolsmod.datagen.texture.ModBlockStateProvider
 import io.github.realyusufismail.armourandtoolsmod.datagen.texture.ModItemStateProvider
-import io.github.realyusufismail.armourandtoolsmod.datagen.world.ModWorldGenerationProvider
+import io.github.realyusufismail.armourandtoolsmod.datagen.world.ModWorldGenProvider
 import java.util.*
 import java.util.function.Function
 import java.util.stream.Collectors
@@ -61,7 +61,7 @@ object DataGenerators {
             gen.addProvider(true, blockTag)
             gen.addProvider(true, ModItemTagsProvider(gen, existingFileHelper, blockTag, lookup))
             gen.addProvider(true, MainModRecipeProvider(gen))
-            gen.addProvider(true, ModWorldGenerationProvider(gen.packOutput, lookup))
+            gen.addProvider(true, ModWorldGenProvider(gen.packOutput, lookup))
             gen.addProvider(
                 true, ArmourAndTollsModSpriteSourceProvider(gen.packOutput, existingFileHelper))
 

diff --git a/...ain/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/world/ModOreFeaturesGen.kt b/...ain/kotlin/io/github/realyusufismail/armourandtoolsmod/datagen/world/ModOreFeaturesGen.kt
diff --git a/...tagen/world/ModWorldGenerationProvider.kt → ...smod/datagen/world/ModWorldGenProvider.kt b/...tagen/world/ModWorldGenerationProvider.kt → ...smod/datagen/world/ModWorldGenProvider.kt
@@ -19,26 +19,20 @@
 package io.github.realyusufismail.armourandtoolsmod.datagen.world
 
 import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod.ArmorAndToolsMod.MOD_ID
+import io.github.realyusufismail.armourandtoolsmod.worldgen.ModConfiguredFeatures
+import io.github.realyusufismail.armourandtoolsmod.worldgen.ModPlacedFeatures
 import java.util.concurrent.CompletableFuture
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.RegistrySetBuilder
 import net.minecraft.core.registries.Registries
 import net.minecraft.data.PackOutput
-import net.minecraft.data.registries.VanillaRegistries
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature
-import net.minecraft.world.level.levelgen.placement.PlacedFeature
 import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider
 
-/** @see VanillaRegistries */
-class ModWorldGenerationProvider(
+class ModWorldGenProvider(
     output: PackOutput,
     registries: CompletableFuture<HolderLookup.Provider>,
-) :
-    DatapackBuiltinEntriesProvider(
-        output,
-        registries,
+    val builder: RegistrySetBuilder =
         RegistrySetBuilder()
-            .add<ConfiguredFeature<*, *>>(
-                Registries.CONFIGURED_FEATURE, ModOreFeaturesGen::bootstrap)
-            .add<PlacedFeature>(Registries.PLACED_FEATURE, ModOrePlacementsGen::bootstrap),
-        mutableSetOf(MOD_ID))
+            .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap)
+            .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap)
+) : DatapackBuiltinEntriesProvider(output, registries, builder, mutableSetOf(MOD_ID))