diff --git a/SinoCore/src/main/java/games/moegirl/sinocraft/sinocore/data/gen/world/AbstractBiomeModifierProvider.java b/SinoCore/src/main/java/games/moegirl/sinocraft/sinocore/data/gen/world/AbstractBiomeModifierProvider.java index 6c9c22d9..1a731c6f 100644 --- a/SinoCore/src/main/java/games/moegirl/sinocraft/sinocore/data/gen/world/AbstractBiomeModifierProvider.java +++ b/SinoCore/src/main/java/games/moegirl/sinocraft/sinocore/data/gen/world/AbstractBiomeModifierProvider.java @@ -69,10 +69,6 @@ protected void add(Feature f) { public record Feature(ResourceKey> feature, GenerationStep.Decoration step, TagKey biomesTag, ResourceKey... biomes) { - @SafeVarargs - public Feature { - } - public boolean hasTag() { return biomesTag != null; } diff --git a/SinoFoundation/src/generated/resources/.cache/302876e16640ec37db1d40e7a69c9b209efba53d b/SinoFoundation/src/generated/resources/.cache/302876e16640ec37db1d40e7a69c9b209efba53d index 041d9b24..0085c4a9 100644 --- a/SinoFoundation/src/generated/resources/.cache/302876e16640ec37db1d40e7a69c9b209efba53d +++ b/SinoFoundation/src/generated/resources/.cache/302876e16640ec37db1d40e7a69c9b209efba53d @@ -1,4 +1,9 @@ -// 1.20.1 2023-06-22T17:43:32.3606874 Tags for minecraft:worldgen/biome mod id sinofoundation +// 1.20.1 2023-07-18T15:00:09.2989573 Tags for minecraft:worldgen/biome mod id sinofoundation +354c6985c3408e3210c1a16966e86384dfa10a06 data/sinofoundation/tags/worldgen/biome/black_jade_generation.json +59f559729d963a3fa2201087858135f47f41856a data/sinofoundation/tags/worldgen/biome/green_jade_generation.json +1c501761cc0f7a9e42494a0999645108e179d540 data/sinofoundation/tags/worldgen/biome/red_jade_generation.json 73fd40022276bb276c3e9df77274d606f06b6083 data/sinofoundation/tags/worldgen/biome/spawn_dragonliver_melon.json 8e2b4b8f30b3e5b39943a1ad3b7a6b6c488dc4dc data/sinofoundation/tags/worldgen/biome/spawn_rehmannia.json 34999a6bcc7e7e4eccf45f2579768f8eaa38b638 data/sinofoundation/tags/worldgen/biome/spawn_rice.json +ba658fa972b1dc52b5824e33f3a167d301f7aa74 data/sinofoundation/tags/worldgen/biome/white_jade_generation.json +1c5ea78745d042ad93e09fcc0a1ea7a544704a26 data/sinofoundation/tags/worldgen/biome/yellow_jade_generation.json diff --git a/SinoFoundation/src/generated/resources/.cache/ca98b2a8e04b301198d42db033803a2521d7c22a b/SinoFoundation/src/generated/resources/.cache/ca98b2a8e04b301198d42db033803a2521d7c22a index 0237f5b1..821dd30e 100644 --- a/SinoFoundation/src/generated/resources/.cache/ca98b2a8e04b301198d42db033803a2521d7c22a +++ b/SinoFoundation/src/generated/resources/.cache/ca98b2a8e04b301198d42db033803a2521d7c22a @@ -1,14 +1,44 @@ -// 1.20.1 2023-07-07T10:54:02.5527277 sinofoundation datapack and biome modifier +// 1.20.1 2023-07-18T15:00:09.303958 sinofoundation datapack and biome modifier deb77128d5e0448e61c0158d8d152f087c54bc65 data/sinofoundation/damage_type/sophora_door.json +901f50ad303bfc698fb99d3731637d44351c9d92 data/sinofoundation/forge/biome_modifier/black_jade.json +f00442513fa3633292c890e4eadc7fab43526e05 data/sinofoundation/forge/biome_modifier/deepslate_black_jade.json +1bb1301530fd1f991095e3e36d42771a7a4eb67c data/sinofoundation/forge/biome_modifier/deepslate_green_jade.json +1358299327755c5dd3b4105dc291ff62653105b3 data/sinofoundation/forge/biome_modifier/deepslate_red_jade.json bea9a3fd51da0ca2f11d75fd2eeb8a2893dd4b99 data/sinofoundation/forge/biome_modifier/deepslate_sulphur.json +75758843df64da6b7064fb80dfea3f07ed8961a4 data/sinofoundation/forge/biome_modifier/deepslate_white_jade.json +c6cb2f5650bb5a1f4388217e924c0149316a87f6 data/sinofoundation/forge/biome_modifier/deepslate_yellow_jade.json +b7ec7c0240feb995d7674105e8eee214b6afaaac data/sinofoundation/forge/biome_modifier/green_jade.json aeb3e4f3fa7a4b46edd00f6485b7c4bcf90be71c data/sinofoundation/forge/biome_modifier/nether_sulphur.json a44ab9940052428be7696fcbe9974c06b0f40bb5 data/sinofoundation/forge/biome_modifier/niter.json +cd84dbcc7f771ecc72526eb6924939fc5238d52d data/sinofoundation/forge/biome_modifier/red_jade.json 44de99975e193bb8b0d8b36ca58499b34c53a29d data/sinofoundation/forge/biome_modifier/sulphur.json +e44c00bb56fd99e8e7a51eea09a30514b8bf3ac3 data/sinofoundation/forge/biome_modifier/white_jade.json +bbbf1829793ed9d1a770a8326e1a3b471dfa5ede data/sinofoundation/forge/biome_modifier/yellow_jade.json +3ff0474e599345e1954b1c2591a8b69b539e7e6b data/sinofoundation/worldgen/configured_feature/black_jade.json +522278b6f7ea48b6563a99c69f5aa270d648ad52 data/sinofoundation/worldgen/configured_feature/deepslate_black_jade.json +8e8a277c516773fe0062487b14976176e3ab94f3 data/sinofoundation/worldgen/configured_feature/deepslate_green_jade.json +01ee56471c7cd30d2424156d650c86ec5aed9db7 data/sinofoundation/worldgen/configured_feature/deepslate_red_jade.json f4da4506ef0dc6133b197b172e7d4a77f7d8e143 data/sinofoundation/worldgen/configured_feature/deepslate_sulphur.json +efdd1faffa33bf754e7315b9966134af586cd327 data/sinofoundation/worldgen/configured_feature/deepslate_white_jade.json +eaed0a4eadf2061a2e7ba1c759cab38ee9e9b3bb data/sinofoundation/worldgen/configured_feature/deepslate_yellow_jade.json +96e17d9c2d44c88eff04db7dc2c596e5e17ff876 data/sinofoundation/worldgen/configured_feature/green_jade.json 53b88ab565ed1def750afc1e9012f7c25466313d data/sinofoundation/worldgen/configured_feature/nether_sulphur.json 49c3dd3fe67ed861ced17fb1b7fa7a80f406a419 data/sinofoundation/worldgen/configured_feature/niter.json +fdeaf46e19cfd03341c971e5f26b0f3d681cda42 data/sinofoundation/worldgen/configured_feature/red_jade.json 188841025eaabf30f0b9347823d8017e7b2a6314 data/sinofoundation/worldgen/configured_feature/sulphur.json +6f4ec13b5305bb2a16fc695c98e034d428842033 data/sinofoundation/worldgen/configured_feature/white_jade.json +d38b6ffe8b03caa4cd4bb4e144d9de1bcd4fd809 data/sinofoundation/worldgen/configured_feature/yellow_jade.json +ec59119586f7b0332a8110d00581c5fd64ecaf6c data/sinofoundation/worldgen/placed_feature/black_jade.json +f7ddfd27b343bb8f71ff632f00a155eab1dbc682 data/sinofoundation/worldgen/placed_feature/deepslate_black_jade.json +ae2c63b3d75030e8ec741d64c5cb4783d27fc3d9 data/sinofoundation/worldgen/placed_feature/deepslate_green_jade.json +21d9b1850d7d4c4b98d34a3a36bcc4f4fde90db2 data/sinofoundation/worldgen/placed_feature/deepslate_red_jade.json 8083ff57c6140e31d8d898a9d778beee7d77c3a3 data/sinofoundation/worldgen/placed_feature/deepslate_sulphur.json +61eacb9894954c7295bac913b690ca30e31ab9ce data/sinofoundation/worldgen/placed_feature/deepslate_white_jade.json +2d6afd6d3ffbb9831e221d1b3b1a7d7883fdd104 data/sinofoundation/worldgen/placed_feature/deepslate_yellow_jade.json +e55a78d33a1bb490f2f75f1ad1c3e5cd1d7ac518 data/sinofoundation/worldgen/placed_feature/green_jade.json 86378565740c3b6d67502c509920962726517620 data/sinofoundation/worldgen/placed_feature/nether_sulphur.json ff1f89d2a254dc1f6b2d1f99ab8f5c947fd2f317 data/sinofoundation/worldgen/placed_feature/niter.json +21174700dea0f1ca98ee478db5f2a31fe17d3987 data/sinofoundation/worldgen/placed_feature/red_jade.json bea2ea35a8c9e4aee0edd67b78dec4a52d5ea309 data/sinofoundation/worldgen/placed_feature/sulphur.json +e5d90ae277726e1e2f074e266db5491e9a0a113d data/sinofoundation/worldgen/placed_feature/white_jade.json +2e828ec39eaa0f5f11856668dd74f9067b908bbf data/sinofoundation/worldgen/placed_feature/yellow_jade.json diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/black_jade.json new file mode 100644 index 00000000..1363af69 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/black_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:black_jade_generation", + "features": "sinofoundation:black_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_black_jade.json new file mode 100644 index 00000000..718e93a8 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_black_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:black_jade_generation", + "features": "sinofoundation:deepslate_black_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_green_jade.json new file mode 100644 index 00000000..c06fc955 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_green_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:green_jade_generation", + "features": "sinofoundation:deepslate_green_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_red_jade.json new file mode 100644 index 00000000..c23dbfc9 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_red_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:red_jade_generation", + "features": "sinofoundation:deepslate_red_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_white_jade.json new file mode 100644 index 00000000..948ae662 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_white_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:white_jade_generation", + "features": "sinofoundation:deepslate_white_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_yellow_jade.json new file mode 100644 index 00000000..a5aca000 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/deepslate_yellow_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:yellow_jade_generation", + "features": "sinofoundation:deepslate_yellow_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/green_jade.json new file mode 100644 index 00000000..798826dd --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/green_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:green_jade_generation", + "features": "sinofoundation:green_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/red_jade.json new file mode 100644 index 00000000..774edae7 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/red_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:red_jade_generation", + "features": "sinofoundation:red_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/white_jade.json new file mode 100644 index 00000000..1224b89e --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/white_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:white_jade_generation", + "features": "sinofoundation:white_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/yellow_jade.json new file mode 100644 index 00000000..611f868b --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/forge/biome_modifier/yellow_jade.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#sinofoundation:yellow_jade_generation", + "features": "sinofoundation:yellow_jade", + "step": "underground_ores" +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/black_jade_generation.json b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/black_jade_generation.json new file mode 100644 index 00000000..e2ca260d --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/black_jade_generation.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:is_mountain", + "#minecraft:is_hill" + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/green_jade_generation.json b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/green_jade_generation.json new file mode 100644 index 00000000..b43c9c89 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/green_jade_generation.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#minecraft:is_ocean", + "#minecraft:is_deep_ocean", + "minecraft:swamp", + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/red_jade_generation.json b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/red_jade_generation.json new file mode 100644 index 00000000..00a18c4e --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/red_jade_generation.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:is_badlands", + "minecraft:mushroom_fields" + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/white_jade_generation.json b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/white_jade_generation.json new file mode 100644 index 00000000..70454dd4 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/white_jade_generation.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#minecraft:is_forest", + "minecraft:plains", + "minecraft:snowy_plains", + "minecraft:sunflower_plains" + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/yellow_jade_generation.json b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/yellow_jade_generation.json new file mode 100644 index 00000000..420f8b6b --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/tags/worldgen/biome/yellow_jade_generation.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:is_savanna", + "minecraft:desert" + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/black_jade.json new file mode 100644 index 00000000..17d1ad6d --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/black_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:black_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_black_jade.json new file mode 100644 index 00000000..13ee5653 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_black_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:deepslate_black_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_green_jade.json new file mode 100644 index 00000000..fe9596e9 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_green_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:deepslate_green_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_red_jade.json new file mode 100644 index 00000000..7b129257 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_red_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:deepslate_red_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_white_jade.json new file mode 100644 index 00000000..14450651 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_white_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:deepslate_white_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_yellow_jade.json new file mode 100644 index 00000000..4caa629f --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/deepslate_yellow_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:deepslate_yellow_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/green_jade.json new file mode 100644 index 00000000..2727e32e --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/green_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:green_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/red_jade.json new file mode 100644 index 00000000..d9864b1f --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/red_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:red_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/white_jade.json new file mode 100644 index 00000000..873c5fcd --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/white_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:white_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/yellow_jade.json new file mode 100644 index 00000000..8205f774 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/configured_feature/yellow_jade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "sinofoundation:yellow_jade_ore" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/black_jade.json new file mode 100644 index 00000000..22c82dc5 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/black_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:black_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 64 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_black_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_black_jade.json new file mode 100644 index 00000000..f9c9de73 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_black_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:deepslate_black_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 4 + }, + "min_inclusive": { + "absolute": -20 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_green_jade.json new file mode 100644 index 00000000..9a0dc13d --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_green_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:deepslate_green_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 4 + }, + "min_inclusive": { + "absolute": -48 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_red_jade.json new file mode 100644 index 00000000..479b9920 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_red_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:deepslate_red_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 4 + }, + "min_inclusive": { + "absolute": -48 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_white_jade.json new file mode 100644 index 00000000..1b7d2e50 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_white_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:deepslate_white_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 4 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_yellow_jade.json new file mode 100644 index 00000000..029d64e4 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/deepslate_yellow_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:deepslate_yellow_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 4 + }, + "min_inclusive": { + "absolute": -48 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/green_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/green_jade.json new file mode 100644 index 00000000..6c2fea5b --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/green_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:green_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 5 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/red_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/red_jade.json new file mode 100644 index 00000000..6750278e --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/red_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:red_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 20 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/white_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/white_jade.json new file mode 100644 index 00000000..d34be1be --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/white_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:white_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 48 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/yellow_jade.json b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/yellow_jade.json new file mode 100644 index 00000000..dbd25cc4 --- /dev/null +++ b/SinoFoundation/src/generated/resources/data/sinofoundation/worldgen/placed_feature/yellow_jade.json @@ -0,0 +1,27 @@ +{ + "feature": "sinofoundation:yellow_jade", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:uniform", + "max_inclusive": { + "absolute": 5 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTags.java b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTags.java index 23e898fc..cbe86b7d 100644 --- a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTags.java +++ b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTags.java @@ -15,6 +15,12 @@ public class SFDBiomeTags { public static final TagKey SPAWN_REHMANNIA = biome("spawn_rehmannia"); public static final TagKey SPAWN_DRAGONLIVER_MELON = biome("spawn_dragonliver_melon"); + public static final TagKey BLACK_JADE_GENERATION = biome("black_jade_generation"); + public static final TagKey GREEN_JADE_GENERATION = biome("green_jade_generation"); + public static final TagKey RED_JADE_GENERATION = biome("red_jade_generation"); + public static final TagKey WHITE_JADE_GENERATION = biome("white_jade_generation"); + public static final TagKey YELLOW_JADE_GENERATION = biome("yellow_jade_generation"); + public static TagKey biome(String name) { return TagKey.create(Registries.BIOME, new ResourceLocation(SinoFoundation.MODID, name)); } diff --git a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTagsProvider.java b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTagsProvider.java index 2714aac8..0a463e28 100644 --- a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTagsProvider.java +++ b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/tag/SFDBiomeTagsProvider.java @@ -23,5 +23,11 @@ protected void addTags(HolderLookup.Provider provider) { tag(SFDBiomeTags.SPAWN_RICE).addTags(BiomeTags.IS_RIVER).addTags(Tags.Biomes.IS_PLAINS); tag(SFDBiomeTags.SPAWN_REHMANNIA).addTag(BiomeTags.IS_FOREST).add(Biomes.BAMBOO_JUNGLE); tag(SFDBiomeTags.SPAWN_DRAGONLIVER_MELON).addTags(Tags.Biomes.IS_SNOWY); + + tag(SFDBiomeTags.BLACK_JADE_GENERATION).addTags(BiomeTags.IS_MOUNTAIN, BiomeTags.IS_HILL); + tag(SFDBiomeTags.GREEN_JADE_GENERATION).addTags(BiomeTags.IS_OCEAN, BiomeTags.IS_DEEP_OCEAN).add(Biomes.SWAMP, Biomes.MANGROVE_SWAMP); + tag(SFDBiomeTags.RED_JADE_GENERATION).addTags(BiomeTags.IS_BADLANDS).add(Biomes.MUSHROOM_FIELDS); + tag(SFDBiomeTags.WHITE_JADE_GENERATION).addTags(BiomeTags.IS_FOREST).add(Biomes.PLAINS, Biomes.SNOWY_PLAINS, Biomes.SUNFLOWER_PLAINS); + tag(SFDBiomeTags.YELLOW_JADE_GENERATION).addTags(BiomeTags.IS_SAVANNA).add(Biomes.DESERT); } } diff --git a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/world/SFDBiomeModifierProvider.java b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/world/SFDBiomeModifierProvider.java index 0c4dd1d8..ad567bdc 100644 --- a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/world/SFDBiomeModifierProvider.java +++ b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/data/gen/world/SFDBiomeModifierProvider.java @@ -1,6 +1,7 @@ package games.moegirl.sinocraft.sinofoundation.data.gen.world; import games.moegirl.sinocraft.sinocore.data.gen.world.AbstractBiomeModifierProvider; +import games.moegirl.sinocraft.sinofoundation.data.gen.tag.SFDBiomeTags; import games.moegirl.sinocraft.sinofoundation.world.SFDFeatures; import net.minecraft.data.PackOutput; import net.minecraft.tags.BiomeTags; @@ -22,5 +23,16 @@ protected void registerBiomeModifiers() { add(new Feature(SFDFeatures.NETHER_SULPHUR, GenerationStep.Decoration.UNDERGROUND_ORES, BiomeTags.IS_NETHER)); add(new Feature(SFDFeatures.DEEPSLATE_SULPHUR, GenerationStep.Decoration.UNDERGROUND_ORES, BiomeTags.IS_OVERWORLD)); add(new Feature(SFDFeatures.NITER, GenerationStep.Decoration.UNDERGROUND_ORES, BiomeTags.IS_OVERWORLD)); + + add(new Feature(SFDFeatures.BLACK_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.BLACK_JADE_GENERATION)); + add(new Feature(SFDFeatures.DEEPSLATE_BLACK_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.BLACK_JADE_GENERATION)); + add(new Feature(SFDFeatures.GREEN_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.GREEN_JADE_GENERATION)); + add(new Feature(SFDFeatures.DEEPSLATE_GREEN_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.GREEN_JADE_GENERATION)); + add(new Feature(SFDFeatures.RED_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.RED_JADE_GENERATION)); + add(new Feature(SFDFeatures.DEEPSLATE_RED_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.RED_JADE_GENERATION)); + add(new Feature(SFDFeatures.WHITE_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.WHITE_JADE_GENERATION)); + add(new Feature(SFDFeatures.DEEPSLATE_WHITE_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.WHITE_JADE_GENERATION)); + add(new Feature(SFDFeatures.YELLOW_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.YELLOW_JADE_GENERATION)); + add(new Feature(SFDFeatures.DEEPSLATE_YELLOW_JADE, GenerationStep.Decoration.UNDERGROUND_ORES, SFDBiomeTags.YELLOW_JADE_GENERATION)); } } diff --git a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDFeatures.java b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDFeatures.java index b620c64d..144936bb 100644 --- a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDFeatures.java +++ b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDFeatures.java @@ -39,6 +39,17 @@ public class SFDFeatures { public static final ResourceKey> DEEPSLATE_SULPHUR = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_sulphur")); public static final ResourceKey> NITER = FeaturesHelper.createKey(new ResourceLocation(MODID, "niter")); + public static final ResourceKey> BLACK_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "black_jade")); + public static final ResourceKey> DEEPSLATE_BLACK_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_black_jade")); + public static final ResourceKey> GREEN_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "green_jade")); + public static final ResourceKey> DEEPSLATE_GREEN_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_green_jade")); + public static final ResourceKey> RED_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "red_jade")); + public static final ResourceKey> DEEPSLATE_RED_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_red_jade")); + public static final ResourceKey> WHITE_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "white_jade")); + public static final ResourceKey> DEEPSLATE_WHITE_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_white_jade")); + public static final ResourceKey> YELLOW_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "yellow_jade")); + public static final ResourceKey> DEEPSLATE_YELLOW_JADE = FeaturesHelper.createKey(new ResourceLocation(MODID, "deepslate_yellow_jade")); + // public static final ResourceKey> RICE = FeatureUtils.createKey(MODID + ":rice"); // public static final ResourceKey> REHMANNIA = FeatureUtils.createKey(MODID + ":rehmannia"); // public static final ResourceKey> DRAGONLIVER_MELON = FeatureUtils.createKey(MODID + ":dragonliver_melon"); @@ -48,6 +59,17 @@ public class SFDFeatures { public static Holder.Reference> HOLDER_DEEPSLATE_SULPHUR; public static Holder.Reference> HOLDER_NITER; + public static Holder.Reference> HOLDER_BLACK_JADE; + public static Holder.Reference> HOLDER_DEEPSLATE_BLACK_JADE; + public static Holder.Reference> HOLDER_GREEN_JADE; + public static Holder.Reference> HOLDER_DEEPSLATE_GREEN_JADE; + public static Holder.Reference> HOLDER_RED_JADE; + public static Holder.Reference> HOLDER_DEEPSLATE_RED_JADE; + public static Holder.Reference> HOLDER_WHITE_JADE; + public static Holder.Reference> HOLDER_DEEPSLATE_WHITE_JADE; + public static Holder.Reference> HOLDER_YELLOW_JADE; + public static Holder.Reference> HOLDER_DEEPSLATE_YELLOW_JADE; + // public static Holder.Reference> HOLDER_RICE; // public static Holder.Reference> HOLDER_REHMANNIA; // public static Holder.Reference> HOLDER_DRAGONLIVER_MELON; @@ -57,6 +79,17 @@ public static void bootstrap(BootstapContext> context) { HOLDER_NETHER_SULPHUR = context.register(SFDFeatures.NETHER_SULPHUR, netherrackOre(SFDBlocks.NETHER_SULPHUR_ORE, 6)); HOLDER_DEEPSLATE_SULPHUR = context.register(SFDFeatures.DEEPSLATE_SULPHUR, overworldDeepslateOre(SFDBlocks.DEEP_SLATE_SULPHUR_ORE, 5)); HOLDER_NITER = context.register(SFDFeatures.NITER, overworldStoneOre(SFDBlocks.NITER_ORE, 8)); + + HOLDER_BLACK_JADE = context.register(SFDFeatures.BLACK_JADE, overworldStoneOre(SFDBlocks.BLACK_JADE_ORE, 3)); + HOLDER_DEEPSLATE_BLACK_JADE = context.register(SFDFeatures.DEEPSLATE_BLACK_JADE, overworldDeepslateOre(SFDBlocks.DEEPSLATE_BLACK_JADE_ORE, 3)); + HOLDER_GREEN_JADE = context.register(SFDFeatures.GREEN_JADE, overworldStoneOre(SFDBlocks.GREEN_JADE_ORE, 3)); + HOLDER_DEEPSLATE_GREEN_JADE = context.register(SFDFeatures.DEEPSLATE_GREEN_JADE, overworldDeepslateOre(SFDBlocks.DEEPSLATE_GREEN_JADE_ORE, 3)); + HOLDER_RED_JADE = context.register(SFDFeatures.RED_JADE, overworldStoneOre(SFDBlocks.RED_JADE_ORE, 3)); + HOLDER_DEEPSLATE_RED_JADE = context.register(SFDFeatures.DEEPSLATE_RED_JADE, overworldDeepslateOre(SFDBlocks.DEEPSLATE_RED_JADE_ORE, 3)); + HOLDER_WHITE_JADE = context.register(SFDFeatures.WHITE_JADE, overworldStoneOre(SFDBlocks.WHITE_JADE_ORE, 3)); + HOLDER_DEEPSLATE_WHITE_JADE = context.register(SFDFeatures.DEEPSLATE_WHITE_JADE, overworldDeepslateOre(SFDBlocks.DEEPSLATE_WHITE_JADE_ORE, 3)); + HOLDER_YELLOW_JADE = context.register(SFDFeatures.YELLOW_JADE, overworldStoneOre(SFDBlocks.YELLOW_JADE_ORE, 3)); + HOLDER_DEEPSLATE_YELLOW_JADE = context.register(SFDFeatures.DEEPSLATE_YELLOW_JADE, overworldDeepslateOre(SFDBlocks.DEEPSLATE_YELLOW_JADE_ORE, 3)); // HOLDER_RICE = context.register(SFDFeatures.RICE, cropConfiguration(SFDBlocks.RICE)); // HOLDER_REHMANNIA = context.register(SFDFeatures.REHMANNIA, cropConfiguration(SFDBlocks.REHMANNIA)); // HOLDER_DRAGONLIVER_MELON = context.register(SFDFeatures.DRAGONLIVER_MELON, cropConfiguration(SFDBlocks.DRAGONLIVER_MELON)); diff --git a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDPlacements.java b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDPlacements.java index f2ece8af..e454f4b2 100644 --- a/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDPlacements.java +++ b/SinoFoundation/src/main/java/games/moegirl/sinocraft/sinofoundation/world/SFDPlacements.java @@ -1,5 +1,6 @@ package games.moegirl.sinocraft.sinofoundation.world; +import games.moegirl.sinocraft.sinocore.world.features.FeaturesHelper; import games.moegirl.sinocraft.sinocore.world.placement.PlacementsHelper; import net.minecraft.core.Holder; import net.minecraft.data.worldgen.BootstapContext; @@ -23,6 +24,18 @@ public class SFDPlacements { public static final ResourceKey NETHER_SULPHUR = PlacementsHelper.createKey(new ResourceLocation(MODID, "nether_sulphur")); public static final ResourceKey DEEPSLATE_SULPHUR = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_sulphur")); public static final ResourceKey NITER = PlacementsHelper.createKey(new ResourceLocation(MODID, "niter")); + + public static final ResourceKey BLACK_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "black_jade")); + public static final ResourceKey DEEPSLATE_BLACK_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_black_jade")); + public static final ResourceKey GREEN_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "green_jade")); + public static final ResourceKey DEEPSLATE_GREEN_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_green_jade")); + public static final ResourceKey RED_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "red_jade")); + public static final ResourceKey DEEPSLATE_RED_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_red_jade")); + public static final ResourceKey WHITE_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "white_jade")); + public static final ResourceKey DEEPSLATE_WHITE_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_white_jade")); + public static final ResourceKey YELLOW_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "yellow_jade")); + public static final ResourceKey DEEPSLATE_YELLOW_JADE = PlacementsHelper.createKey(new ResourceLocation(MODID, "deepslate_yellow_jade")); + // public static final ResourceKey RICE = PlacementUtils.createKey(MODID + ":rice"); // public static final ResourceKey REHMANNIA = PlacementUtils.createKey(MODID + ":rehmannia"); // public static final ResourceKey DRAGONLIVER_MELON = PlacementUtils.createKey(MODID + ":dragonliver_melon"); @@ -32,12 +45,34 @@ public class SFDPlacements { public static Holder.Reference HOLDER_DEEPSLATE_SULPHUR; public static Holder.Reference HOLDER_NITER; + public static Holder.Reference HOLDER_BLACK_JADE; + public static Holder.Reference HOLDER_DEEPSLATE_BLACK_JADE; + public static Holder.Reference HOLDER_GREEN_JADE; + public static Holder.Reference HOLDER_DEEPSLATE_GREEN_JADE; + public static Holder.Reference HOLDER_RED_JADE; + public static Holder.Reference HOLDER_DEEPSLATE_RED_JADE; + public static Holder.Reference HOLDER_WHITE_JADE; + public static Holder.Reference HOLDER_DEEPSLATE_WHITE_JADE; + public static Holder.Reference HOLDER_YELLOW_JADE; + public static Holder.Reference HOLDER_DEEPSLATE_YELLOW_JADE; + public static void bootstrap(BootstapContext context) { HOLDER_SULPHUR = context.register(SFDPlacements.SULPHUR, orePlaced(SFDFeatures.HOLDER_SULPHUR, 0, 48)); HOLDER_NETHER_SULPHUR = context.register(SFDPlacements.NETHER_SULPHUR, orePlaced(SFDFeatures.HOLDER_NETHER_SULPHUR, 0, 128)); HOLDER_DEEPSLATE_SULPHUR = context.register(SFDPlacements.DEEPSLATE_SULPHUR, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_SULPHUR, -32, 8)); HOLDER_NITER = context.register(SFDPlacements.NITER, orePlaced(SFDFeatures.HOLDER_NITER, 8, 64)); + HOLDER_BLACK_JADE = context.register(SFDPlacements.BLACK_JADE, orePlaced(SFDFeatures.HOLDER_BLACK_JADE, 0, 64)); + HOLDER_DEEPSLATE_BLACK_JADE = context.register(SFDPlacements.DEEPSLATE_BLACK_JADE, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_BLACK_JADE, -20, 4)); + HOLDER_GREEN_JADE = context.register(SFDPlacements.GREEN_JADE, orePlaced(SFDFeatures.HOLDER_GREEN_JADE, 0, 5)); + HOLDER_DEEPSLATE_GREEN_JADE = context.register(SFDPlacements.DEEPSLATE_GREEN_JADE, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_GREEN_JADE, -48, 4)); + HOLDER_RED_JADE = context.register(SFDPlacements.RED_JADE, orePlaced(SFDFeatures.HOLDER_RED_JADE, 0, 20)); + HOLDER_DEEPSLATE_RED_JADE = context.register(SFDPlacements.DEEPSLATE_RED_JADE, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_RED_JADE, -48, 4)); + HOLDER_WHITE_JADE = context.register(SFDPlacements.WHITE_JADE, orePlaced(SFDFeatures.HOLDER_WHITE_JADE, 0, 48)); + HOLDER_DEEPSLATE_WHITE_JADE = context.register(SFDPlacements.DEEPSLATE_WHITE_JADE, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_WHITE_JADE, 0, 4)); + HOLDER_YELLOW_JADE = context.register(SFDPlacements.YELLOW_JADE, orePlaced(SFDFeatures.HOLDER_YELLOW_JADE, 0, 5)); + HOLDER_DEEPSLATE_YELLOW_JADE = context.register(SFDPlacements.DEEPSLATE_YELLOW_JADE, orePlaced(SFDFeatures.HOLDER_DEEPSLATE_YELLOW_JADE, -48, 4)); + // Ref.RICE = context.register(SFDPlacements.RICE, cropPlaced(SFDFeatures.Ref.RICE, BlockPredicate.matchesFluids(Fluids.WATER))); // Ref.REHMANNIA = context.register(SFDPlacements.REHMANNIA, cropPlaced(SFDFeatures.Ref.REHMANNIA, BlockPredicate.matchesTag(BlockTags.DIRT))); // Ref.DRAGONLIVER_MELON = context.register(SFDPlacements.DRAGONLIVER_MELON, cropPlaced(SFDFeatures.Ref.DRAGONLIVER_MELON, BlockPredicate.matchesTag(SFDBlockTags.SPAWN_DRAGONLIVER_MELON)));