Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forge 1.20 1.3 #220

Merged
merged 11 commits into from
Oct 23, 2023
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
// 1.20.1 2023-10-15T17:45:38.4369164 Registries
// 1.20.1 2023-10-21T23:32:47.3915637 Registries
c92ff9d09d1e634b03702ed2548052b8dd904e91 data/deeperdarker/dimension_type/otherside.json
4722285e5c50f018e9423f4e719e9a5dd67c3bd8 data/deeperdarker/worldgen/biome/blooming_caverns.json
16372ebfc8f36cee32a93f72d13073bb98639882 data/deeperdarker/worldgen/biome/deeplands.json
bd2c433caf3a3f7dfff3668a68dbdf56fa994df5 data/deeperdarker/worldgen/biome/echoing_forest.json
06d29b9291ed3a63be90750a8c6f182e0c168b7b data/deeperdarker/worldgen/biome/overcast_columns.json
5097028f5c8ae5e294126d6df771e3126d4fbd07 data/deeperdarker/worldgen/configured_feature/gloomslate_column.json
ba29dfa84f2bebe688044c6e89b6c1d38dbaf0c6 data/deeperdarker/worldgen/configured_feature/gloomslate_generation.json
5d330f021ad1e22b038b08bfd79b49f5da654254 data/deeperdarker/worldgen/configured_feature/gloomy_sculk_patch.json
091c066d3e288c08e5d68a8aca7b3fb0e6e5639b data/deeperdarker/worldgen/configured_feature/gloomy_sculk_vegetation.json
9973648607e0cc301d46c77f4021d725ca22b533 data/deeperdarker/worldgen/configured_feature/ore_blooming_moss.json
1b6dbe9c2e15df01aa9a3c27beb46ccc4e91d5df data/deeperdarker/worldgen/configured_feature/ore_echo_soil.json
a7efce9cf36bea20e3226c6fcb962b41b78df3f6 data/deeperdarker/worldgen/configured_feature/ore_gloomslate_coal.json
e21d4d48d366ec5aa99fce98c51d5ae4c947c350 data/deeperdarker/worldgen/configured_feature/ore_gloomslate_copper.json
Expand Down Expand Up @@ -40,6 +42,7 @@ ee40c6672e01f7903cbd018effd3b9fb238b9dc8 data/deeperdarker/worldgen/configured_f
7597d5a74f034f91aefd5b4e7567566295057281 data/deeperdarker/worldgen/configured_feature/surface_gloomslate.json
8d9c10bf4c7aa2ff2fa6f7aa8c3b646ab05433b9 data/deeperdarker/worldgen/configured_feature/surface_sculk_stone.json
853f5d90238319461c608dc077bc999afe6b8bcb data/deeperdarker/worldgen/configured_feature/tree_echo.json
34fb9a5e22128132e9fb0b0a7700008873e4ac41 data/deeperdarker/worldgen/placed_feature/blooming_moss.json
cc0ab13e199295089d8269584cc7aa83b3595c9b data/deeperdarker/worldgen/placed_feature/echo_soil.json
e18687e9b7d94385510ea85e00af1ba4e24e32ec data/deeperdarker/worldgen/placed_feature/echo_tree.json
739dfb25c8e5de7a098ca0c9a256cc28d890e63c data/deeperdarker/worldgen/placed_feature/gloomslate_coal.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// 1.20.1 2023-07-30T14:33:21.5138823 Block States: deeperdarker
// 1.20.1 2023-10-21T23:09:41.5245696 Block States: deeperdarker
4394f02c270408be611b2f3ba7abfbfd658cb0ff assets/deeperdarker/blockstates/ancient_vase.json
165980177c5adcf470b9a08fe401e3bb1a4966f0 assets/deeperdarker/blockstates/blooming_moss_block.json
498227afd0f8c9b0fa72dfef97bf22b886a9069f assets/deeperdarker/blockstates/blooming_sculk.json
b618639a1bd650f5bbceed1f24a777ca15ae37fe assets/deeperdarker/blockstates/chiseled_gloomslate.json
389153807c5651eba34cf020ac7d3b675b0418a2 assets/deeperdarker/blockstates/chiseled_sculk_stone.json
68002cff985c9e3e803a31cbe314c4e4d6ac9e36 assets/deeperdarker/blockstates/cobbled_gloomslate.json
Expand Down Expand Up @@ -113,6 +115,8 @@ d7f5127b333b891bbfa97cee4414876fef5429d5 assets/deeperdarker/blockstates/smooth_
e94fc45e791c65302fcc908ab5d32adc564c5e88 assets/deeperdarker/blockstates/stripped_echo_log.json
1482ba18bb49fe90f1bb3d0b7aec7963e6c0ac9f assets/deeperdarker/blockstates/stripped_echo_wood.json
690d24d273d0514954cb5395b0a6220314038cfd assets/deeperdarker/models/block/ancient_vase.json
5f6d78b44fd7067c2670c9e989ce03e4e9aac70f assets/deeperdarker/models/block/blooming_moss_block.json
446377a22c7cd0fa8486a0da7afe4adf393c90e2 assets/deeperdarker/models/block/blooming_sculk.json
b00bfe63a4595969e6f0a510761702536bf5c367 assets/deeperdarker/models/block/chiseled_gloomslate.json
72cffa498213da488cf3a2f3f60488de0a5fab6a assets/deeperdarker/models/block/chiseled_sculk_stone.json
95d18c450b387ca11be36213e2be0e675b3a7440 assets/deeperdarker/models/block/cobbled_gloomslate.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-09-20T17:04:06.8932967 Tags for minecraft:block mod id deeperdarker
// 1.20.1 2023-10-21T23:09:41.5106188 Tags for minecraft:block mod id deeperdarker
453499b5116c2c24d57c28ec55db0211260f511d data/deeperdarker/tags/blocks/echo_soil.json
5fc75620cbf33b6fbe8762687116de2f0df1bd34 data/deeperdarker/tags/blocks/gloomslate_replaceable.json
1b524a72db2dc423a915068148fa9e921f2e46f5 data/deeperdarker/tags/blocks/gloomy_sculk_replaceable.json
Expand All @@ -21,6 +21,7 @@ d88fb43be0304b77c90c64f924fa2b46c4eeea4a data/forge/tags/blocks/stone.json
ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/minecraft/tags/blocks/coal_ores.json
dc2be5311ef04baad7565936ffafc6dcea324cf1 data/minecraft/tags/blocks/copper_ores.json
84c6024e42063deecc27f59b5a97328b415f4a05 data/minecraft/tags/blocks/diamond_ores.json
8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/dirt.json
41a0ed1cf9fcf4b0f4e41d3155f010eb069e2edc data/minecraft/tags/blocks/emerald_ores.json
4b1b7b3d622aeb255906e952be4ddaf003b6026f data/minecraft/tags/blocks/fence_gates.json
a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/blocks/gold_ores.json
Expand All @@ -30,7 +31,7 @@ e85880d9acf64424927082c80e9af7c9f50de52f data/minecraft/tags/blocks/lapis_ores.j
615016fb2f7bd4866e694de5e712cb29bb434032 data/minecraft/tags/blocks/logs_that_burn.json
ff30cceaa398179d6968c43125fcc0cc5b17312f data/minecraft/tags/blocks/mineable/axe.json
5292a241fb840cb557b81ad9012e39a2168f8888 data/minecraft/tags/blocks/mineable/hoe.json
1ea4c81c2ab76027e0b0e2ae280e25f9445de8ca data/minecraft/tags/blocks/mineable/pickaxe.json
ad177a07d9375078090756e86bdf590b27cd0566 data/minecraft/tags/blocks/mineable/pickaxe.json
f7b6f4235356ecc4395d064f20adbb6abb2fb51a data/minecraft/tags/blocks/mineable/shovel.json
6349c914702ba9732f2266363153bb5d75633878 data/minecraft/tags/blocks/needs_iron_tool.json
33d07a5e8b6e764033ad98c304357baa651ed25c data/minecraft/tags/blocks/needs_stone_tool.json
Expand All @@ -39,6 +40,9 @@ a3dbfaeb7781a16a5f0d599aec390339e541834c data/minecraft/tags/blocks/planks.json
b87f41ec93385cf003a9e81713446620acd52b86 data/minecraft/tags/blocks/redstone_ores.json
194ada896e5d1f6d6cac977e3e771bc784d9911b data/minecraft/tags/blocks/saplings.json
7ad41c3bc6a4b4e320a75ce5e25e9ee075ed3663 data/minecraft/tags/blocks/slabs.json
8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/small_dripleaf_placeable.json
8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/sniffer_diggable_block.json
8c05a0f37456da64c198eca83b383a909c2fe23f data/minecraft/tags/blocks/sniffer_egg_hatch_boost.json
8dfd3b492264b019307369b18d494910d7fe89e8 data/minecraft/tags/blocks/stairs.json
3160b8c1824cc26cacda9143dd8d832ff3a4c422 data/minecraft/tags/blocks/standing_signs.json
e72a4292dc72ea8e75aa284e652feb7fd955f8b9 data/minecraft/tags/blocks/walls.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// 1.20.1 2023-07-30T14:33:21.5008835 Item Models: deeperdarker
// 1.20.1 2023-10-21T23:09:41.5165979 Item Models: deeperdarker
b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json
f2fe62e9aa1b817d10053a94259d530922d39562 assets/deeperdarker/models/item/blooming_moss_block.json
2072c85056b9991df1889bc23b0e49f44e63bb56 assets/deeperdarker/models/item/blooming_sculk.json
bc192f3477fde8efde3aba14cdd0016b9b4c74cf assets/deeperdarker/models/item/chiseled_gloomslate.json
89f7cacebe1029e9f27884b1aeba759b4f9c978f assets/deeperdarker/models/item/chiseled_sculk_stone.json
0eb658806d9c4c3faa4843fa00fd273b3d44dbdc assets/deeperdarker/models/item/cobbled_gloomslate.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// 1.20.1 2023-09-06T16:13:42.4392893 Loot Tables
// 1.20.1 2023-10-21T23:09:41.5195872 Loot Tables
f4fe1f635cb6e3e68f5aaae0488de719277f01f2 data/deeperdarker/loot_tables/blocks/ancient_vase.json
006429d2ca86d8c54cd1448e51b2ffd95ef52b52 data/deeperdarker/loot_tables/blocks/blooming_moss_block.json
d95dd7543f0edaed48f7e47c555fd9a2b5c517d4 data/deeperdarker/loot_tables/blocks/blooming_sculk.json
55589564f7ea5847138db468199d54cd1142b139 data/deeperdarker/loot_tables/blocks/chiseled_gloomslate.json
c29aeb5add1d38dc94087bd93c15ff08dab7a74d data/deeperdarker/loot_tables/blocks/chiseled_sculk_stone.json
debbc9e18c6194b29378fce6394766e7864f9ee7 data/deeperdarker/loot_tables/blocks/cobbled_gloomslate.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2023-09-20T17:07:35.782146 Languages: en_us
3d894dc8ef64b9686d4b535bee05f377dfbd7b96 assets/deeperdarker/lang/en_us.json
// 1.20.1 2023-10-21T23:09:41.5235733 Languages: en_us
e44168a3fb758130bc02ea6d71a6226564220bf9 assets/deeperdarker/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 1.20.1 2023-09-10T12:31:46.6260576 Advancements
// 1.20.1 2023-10-21T23:34:22.8911106 Advancements
a76845401466a58c8f341ce586f131a1d31c123e data/deeperdarker/advancements/main/enter_otherside.json
c92a96dd0a42d69d61838ea2b3e3730e93306019 data/deeperdarker/advancements/main/explore_otherside.json
8b124d675dec747cdc32486c1d7098eb8bce594d data/deeperdarker/advancements/main/explore_otherside.json
cf318040575219b02ae94941e0fb33c02f196203 data/deeperdarker/advancements/main/find_ancient_city.json
e35f7e028016ba746172bbef9f8469f33e99a450 data/deeperdarker/advancements/main/find_ancient_temple.json
0025e3f26af1bd7a49bef17667fd7df05657e4c9 data/deeperdarker/advancements/main/kill_all_sculk_mobs.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "deeperdarker:block/blooming_moss_block"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "deeperdarker:block/blooming_sculk"
}
}
}
2 changes: 2 additions & 0 deletions src/generated/resources/assets/deeperdarker/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"advancements.deeperdarker.warden_armor.description": "Protect yourself with a full set of Warden Armor",
"advancements.deeperdarker.warden_armor.title": "Cover Me with Sculk",
"block.deeperdarker.ancient_vase": "Ancient Vase",
"block.deeperdarker.blooming_moss_block": "Blooming Moss Block",
"block.deeperdarker.blooming_sculk": "Blooming Sculk",
"block.deeperdarker.chiseled_gloomslate": "Chiseled Gloomslate",
"block.deeperdarker.chiseled_sculk_stone": "Chiseled Sculk Stone",
"block.deeperdarker.cobbled_gloomslate": "Cobbled Gloomslate",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "deeperdarker:block/blooming_moss_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "deeperdarker:block/sculk_stone",
"side": "deeperdarker:block/blooming_sculk",
"top": "deeperdarker:block/blooming_sculk_top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "deeperdarker:block/blooming_moss_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "deeperdarker:block/blooming_sculk"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
{
"parent": "deeperdarker:main/enter_otherside",
"criteria": {
"blooming_caverns": {
"conditions": {
"player": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"biome": "deeperdarker:blooming_caverns"
}
}
}
]
},
"trigger": "minecraft:location"
},
"deeplands": {
"conditions": {
"player": [
Expand Down Expand Up @@ -73,6 +89,9 @@
[
"echoing_forest"
],
[
"blooming_caverns"
],
[
"overcast_columns"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "deeperdarker:blooming_moss_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "deeperdarker:blocks/blooming_moss_block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "deeperdarker:blooming_sculk"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "deeperdarker:cobbled_sculk_stone"
}
]
}
],
"rolls": 1.0
}
],
"random_sequence": "deeperdarker:blocks/blooming_sculk"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"carvers": {},
"downfall": 0.2,
"effects": {
"fog_color": 1716032,
"mood_sound": {
"block_search_extent": 8,
"offset": 2.0,
"sound": "deeperdarker:ambient.otherside.additions",
"tick_delay": 6000
},
"music": {
"max_delay": 24000,
"min_delay": 12000,
"replace_current_music": false,
"sound": "deeperdarker:music.otherside.echoing_forest"
},
"particle": {
"options": {
"type": "minecraft:sculk_charge_pop"
},
"probability": 0.002
},
"sky_color": 8560639,
"water_color": 2066085,
"water_fog_color": 2189448
},
"features": [
[],
[],
[],
[],
[],
[],
[
"deeperdarker:blooming_moss",
"deeperdarker:infested_sculk",
"deeperdarker:sculk_jaw",
"deeperdarker:sculk_coal",
"deeperdarker:sculk_iron",
"deeperdarker:sculk_copper",
"deeperdarker:sculk_gold",
"deeperdarker:sculk_redstone",
"deeperdarker:sculk_emerald",
"deeperdarker:sculk_lapis",
"deeperdarker:sculk_diamond"
],
[],
[],
[
"deeperdarker:sculk_tendrils",
"deeperdarker:sculk_vines"
]
],
"has_precipitation": true,
"spawn_costs": {},
"spawners": {
"ambient": [],
"axolotls": [],
"creature": [],
"misc": [],
"monster": [
{
"type": "deeperdarker:sculk_snapper",
"maxCount": 2,
"minCount": 1,
"weight": 1
}
],
"underground_water_creature": [],
"water_ambient": [],
"water_creature": []
},
"temperature": -0.3
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 40,
"targets": [
{
"state": {
"Name": "deeperdarker:blooming_moss_block"
},
"target": {
"block": "deeperdarker:blooming_sculk",
"predicate_type": "minecraft:block_match"
}
},
{
"state": {
"Name": "deeperdarker:blooming_moss_block"
},
"target": {
"block": "deeperdarker:sculk_grime",
"predicate_type": "minecraft:block_match"
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"feature": "deeperdarker:ore_blooming_moss",
"placement": [
{
"type": "minecraft:count",
"count": 19
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"max_inclusive": {
"below_top": 0
},
"min_inclusive": {
"above_bottom": 0
}
}
},
{
"type": "minecraft:biome"
}
]
}
Loading