diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/oil_crops.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/oil_crops.json index 7c12bd394..a198d23b9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/oil_crops.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/oil_crops.json @@ -28,7 +28,7 @@ } }, "name": "Wild Sunflower", - "text": "$(thing)Sunflowers$() grow between 5 and 40C, and 100 to 400mm of rainfall. Their seeds can also be roasted and eaten!", + "text": "$(thing)Sunflowers$() grow between 5 and 40C, and 100 to 450mm of rainfall. Their seeds can also be roasted and eaten!", "enable_visualize": false }, { @@ -51,7 +51,7 @@ } }, "name": "Wild Rapeseed", - "text": "$(thing)Rapeseed$(), also known as $(thing)Canola$(), grows between -5 and 25C, and 50 to 250mm of rainfall.", + "text": "$(thing)Rapeseed$(), also known as $(thing)Canola$(), grows between -7 and 25C, and 50 to 350mm of rainfall.", "enable_visualize": false } ] diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json b/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json new file mode 100644 index 000000000..b065550a9 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/rapeseed_patch.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:tall_wild_crop", + "config": { + "block": "tfg:rapeseed_wild" + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "tfg:rapeseed_wild", + "Properties": { + "part": "bottom" + } + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json b/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json new file mode 100644 index 000000000..9407d6def --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/earth/sunflower_patch.json @@ -0,0 +1,40 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "tfc:tall_wild_crop", + "config": { + "block": "tfg:sunflower_wild" + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "tfc:replaceable" + } + }, + { + "type": "block_predicate_filter", + "predicate": { + "type": "would_survive", + "state": { + "Name": "tfg:sunflower_wild", + "Properties": { + "part": "bottom" + } + } + } + } + ] + }, + "tries": 16, + "xz_spread": 10, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json b/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json new file mode 100644 index 000000000..0ec90d6ee --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/rapeseed_patch.json @@ -0,0 +1,20 @@ +{ + "feature": "tfg:earth/rapeseed_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 80 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "tfc:climate", + "min_temperature": -7, + "max_temperature": 25, + "min_rainfall": 50, + "max_rainfall": 350, + "max_forest": "edge" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json b/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json new file mode 100644 index 000000000..9b0003914 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/earth/sunflower_patch.json @@ -0,0 +1,20 @@ +{ + "feature": "tfg:earth/sunflower_patch", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 80 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "tfc:climate", + "min_temperature": 5, + "max_temperature": 40, + "min_rainfall": 100, + "max_rainfall": 450, + "max_forest": "sparse" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index d8a84d609..3471e1a97 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -558,6 +558,10 @@ const registerTFCPlacedFeatures = (event) => { event.add('tfc:in_biome/veins', 'tfg:earth/geode/pyrite') event.add('tfc:in_biome/veins', 'tfg:earth/geode/quartzite') + // Crops + event.add('tfc:feature/crops', 'tfg:earth/sunflower_patch') + event.add('tfc:feature/crops', 'tfg:earth/rapeseed_patch') + // Other decoration event.add('tfc:in_biome/underground_decoration', 'tfg:glow_lichen') event.add('tfc:in_biome/underground_decoration', 'tfg:earth/sulfur_patch') diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 68cad8ea5..7c47a671f 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -153,8 +153,8 @@ const registerTFGFauna = (event) => { const registerTFGCropRanges = (event) => { event.climateRange(climate => { - climate.minHydration(10) - climate.maxHydration(60) + climate.minHydration(20) + climate.maxHydration(80) climate.minTemperature(5) climate.maxTemperature(40) climate.hydrationWiggle(7.5)