-
Notifications
You must be signed in to change notification settings - Fork 11
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 #172 from ChoiceTheorem/ChoiceTheorem/issue150
CTOV 3.4.6
- Loading branch information
Showing
87 changed files
with
1,223 additions
and
9 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| # What's changed | ||
|
|
||
| + Increase village size across the board. | ||
| + Guarantee spawn for waystone and bounty board but it can be anywhere in the village. | ||
| + Added lithostitched as requirement as it should have been | ||
| + Added Ice and Fire Compat {[#159](https://github.com/ChoiceTheorem/ChoiceTheorem-s-overhauled-village/issues/159)} | ||
| + Added Rat cage in petshops | ||
| + Added Cloud Storage Compat {[#160](https://github.com/ChoiceTheorem/ChoiceTheorem-s-overhauled-village/issues/160)} | ||
| - Added Jewelry Compat | ||
| - Added Archers Compat |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/beach.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/beach/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/beach/house", | ||
| "location": "ctov:village/beach/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/christmas.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/christmas/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/christmas/house", | ||
| "location": "ctov:village/christmas/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/dark_forest.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/halloween/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/halloween/house", | ||
| "location": "ctov:village/dark_forest/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/desert/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/desert/house", | ||
| "location": "ctov:village/desert/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
...on/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/desert_oasis.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/desert_oasis/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/desert/house", | ||
| "location": "ctov:village/desert_oasis/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/jungle/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/jungle/house", | ||
| "location": "ctov:village/jungle/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/jungle_tree.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/jungle_tree/terminator", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/jungle/house", | ||
| "location": "ctov:village/jungle_tree/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/mesa/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/mesa/house", | ||
| "location": "ctov:village/mesa/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
.../src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mesa_fortified.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/mesa_fortified/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/mesa_fortified/house", | ||
| "location": "ctov:village/mesa_fortified/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/mountain/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/mountain/house", | ||
| "location": "ctov:village/mountain/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
...src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mountain_alpine.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/mountain_alpine/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/mountain/house", | ||
| "location": "ctov:village/mountain_alpine/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
29 changes: 29 additions & 0 deletions
29
common/src/main/resources/data/ctov/lithostitched/worldgen_modifier/archers/mushroom.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,29 @@ | ||
| { | ||
| "type": "lithostitched:add_template_pool_elements", | ||
| "predicate": { | ||
| "type": "lithostitched:all_of", | ||
| "predicates": [ | ||
| { | ||
| "type": "lithostitched:mod_loaded", | ||
| "mod_id": "archers" | ||
| } | ||
| ] | ||
| }, | ||
| "template_pool": "ctov:village/mushroom/house", | ||
| "elements": [ | ||
| { | ||
| "weight": 5, | ||
| "element": { | ||
| "element_type": "lithostitched:guaranteed", | ||
| "delegate": { | ||
| "element_type": "minecraft:single_pool_element", | ||
| "projection": "rigid", | ||
| "processors": "ctov:village/mushroom/house_red", | ||
| "location": "ctov:village/mushroom/jobsite/archery_range" | ||
| }, | ||
| "count": 1, | ||
| "min_depth": 3 | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.