-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #220 from KyaniteMods/forge-1.20-1.3
Forge 1.20 1.3
- Loading branch information
Showing
46 changed files
with
402 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/deeperdarker/blockstates/blooming_moss_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "deeperdarker:block/blooming_moss_block" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/deeperdarker/blockstates/blooming_sculk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "deeperdarker:block/blooming_sculk" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/deeperdarker/models/block/blooming_moss_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
src/generated/resources/assets/deeperdarker/models/block/blooming_sculk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/deeperdarker/models/item/blooming_moss_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "deeperdarker:block/blooming_moss_block" | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/deeperdarker/models/item/blooming_sculk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "parent": "deeperdarker:block/blooming_sculk" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_moss_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } |
45 changes: 45 additions & 0 deletions
45
src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_sculk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } |
75 changes: 75 additions & 0 deletions
75
src/generated/resources/data/deeperdarker/worldgen/biome/blooming_caverns.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/generated/resources/data/deeperdarker/worldgen/configured_feature/ore_blooming_moss.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/generated/resources/data/deeperdarker/worldgen/placed_feature/blooming_moss.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.