diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b188fe79..05e6949d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## Unreleased +### Breaking Changes +- The LCR recipe for BTX fuel now requires circuit 24, to fix a recipe conflict (#2515) @TomPlop ### Changes - Added casting molds for small gears, nuggets, and rods (#2470) @glitchplaysgames714 - Added some new illages to the hot and dry, and cold and dry climates of the world! @MVG31 @@ -9,16 +11,20 @@ - Magma blocks are now hot to hold @Pyritie - Added a recipe to craft old gregtech facades into ones with a new texture @Pyritie - Fluid sources of alcohol and milks are no longer placeable, so you can't drink from them infinitely any more @bigtho80 +- Added TFC scraping knives (#2494) @glitchplaysgames714 - Changed the ambient sounds in the Beneath, added some to the moon and mars @Pyritie - Tweaked the ambient sounds in the overworld @Pyritie +- Apatite, Tricalcium phosphate, rock salt, potassium sulfate, and ammonium chloride dusts now count as crop fertiliser (#2501) @Xtrial-01 ### Bug fixes - Fix for food stacking everywhere! @Mqrius +- Fixed the grappling hook crashing and sending you to the void if you use it while travelling between dimensions (#2514) @Mqrius - Fixed some curving press tool head recipes being cheaper than intended (#2478) @Pyritie - Fixed some bastion chests being empty @Pyritie - Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714 - Fixed a potential crash involving the refrigerator @Redeix - Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714 - Fixed loot tables for ore indicator buds @Pyritie +- Fixed the new gas fuels being usable on other planets (#2515) @TomPlop ### Translation updates - Chinese (simplified) @jmecn - Ukranian @MetEnBouldry diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/sand.json b/kubejs/assets/ambientsounds/basic/blockgroups/sand.json index b925cad12..9160f6e45 100644 --- a/kubejs/assets/ambientsounds/basic/blockgroups/sand.json +++ b/kubejs/assets/ambientsounds/basic/blockgroups/sand.json @@ -5,5 +5,8 @@ "tfc:sand/brown", "tfc:sand/green", "tfc:sand/pink", - "tfc:sand/black" + "tfc:sand/black", + "ad_astra:moon_sand", + "ad_astra:mars_sand", + "ad_astra:venus_sand" ] diff --git a/kubejs/assets/ambientsounds/basic/blockgroups/water.json b/kubejs/assets/ambientsounds/basic/blockgroups/water.json index c0a8b1fd7..12a7c542f 100644 --- a/kubejs/assets/ambientsounds/basic/blockgroups/water.json +++ b/kubejs/assets/ambientsounds/basic/blockgroups/water.json @@ -1,5 +1,6 @@ [ "minecraft:water", "tfc:fluid/river_water", - "tfc:fluid/salt_water" + "tfc:fluid/salt_water", + "tfg:fluid/semiheavy_ammoniacal_water" ] diff --git a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra.json b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json similarity index 80% rename from kubejs/assets/ambientsounds/basic/dimensions/ad_astra.json rename to kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json index 026482ab9..dcef09e9a 100644 --- a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra.json +++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json @@ -1,9 +1,7 @@ { - "name": "ad_astra", + "name": "ad_astra_mars", "dimension-names": [ - "mars", - "venus", - "glacio" + "mars" ], "biome-selector": { "always": false diff --git a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_orbit.json b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_orbit.json new file mode 100644 index 000000000..e573f9f2b --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_orbit.json @@ -0,0 +1,21 @@ +{ + "name": "end", + "dimension-names": [ + "orbit" + ], + "rain": false, + "storm": false, + "average-height": 0, + "biome-selector": { + "always": false + }, + "regions": [ + { + "name": "unknown", + "volume": 0.3, + "sound-collections": [ + "suspense" + ] + } + ] +} diff --git a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_venus.json b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_venus.json new file mode 100644 index 000000000..ec561ac77 --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_venus.json @@ -0,0 +1,13 @@ +{ + "name": "ad_astra_venus", + "dimension-names": [ + "venus" + ], + "rain": true, + "storm": true, + "biome-selector": { + "always": false + }, + "regions": [ + ] +} diff --git a/kubejs/assets/ambientsounds/basic/regions/highland.json b/kubejs/assets/ambientsounds/basic/regions/highland.json index a4db51513..552881d6b 100644 --- a/kubejs/assets/ambientsounds/basic/regions/highland.json +++ b/kubejs/assets/ambientsounds/basic/regions/highland.json @@ -4,7 +4,11 @@ "old_mountains", "old_mountain_lake", "oceanic_mountains", - "oceanic_mountain_lake" + "oceanic_mountain_lake", + "martian_mountains", + "rusticus_edge", + "amber_edge", + "sangnum_edge" ], "sounds": [ { diff --git a/kubejs/assets/ambientsounds/basic/regions/lake.json b/kubejs/assets/ambientsounds/basic/regions/lake.json index 336ea7287..169fb9015 100644 --- a/kubejs/assets/ambientsounds/basic/regions/lake.json +++ b/kubejs/assets/ambientsounds/basic/regions/lake.json @@ -8,7 +8,8 @@ "oceanic_mountain_lake", "plateau_lake", "volcanic_mountain_lake", - "volcanic_oceanic_mountain_lake" + "volcanic_oceanic_mountain_lake", + "martian_river" ], "features": [ "water" diff --git a/kubejs/assets/ambientsounds/basic/regions/mesa.json b/kubejs/assets/ambientsounds/basic/regions/mesa.json index c41ddb665..fce8bbf99 100644 --- a/kubejs/assets/ambientsounds/basic/regions/mesa.json +++ b/kubejs/assets/ambientsounds/basic/regions/mesa.json @@ -6,7 +6,11 @@ "volcanic_mountains", "volcanic_mountain_lake", "volcanic_oceanic_mountains", - "volcanic_oceanic_mountain_lake" + "volcanic_oceanic_mountain_lake", + "martian_deep_desert", + "martian_dunes", + "martian_dune_edge", + "jagged_tablelands" ], "sounds": [ { diff --git a/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json b/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json deleted file mode 100644 index 0559992d2..000000000 --- a/kubejs/assets/ambientsounds/basic/regions/mushroom_fields.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "mushroom_fields", - "biomes": [ - "amber_hills", - "amber_plains", - "amber_edge", - "rusticus_hills", - "rusticus_plains", - "rusticus_edge", - "sangnum_hills", - "sangnum_plains", - "sangnum_edge" - ], - "sounds": [ - { - "name": "cicadas-mushroom-fields", - "category": "cicadas", - "files": [ - "ambientsounds:animals.cicadas-mushroom-fields" - ], - "volume": 0.5, - "day": 1, - "time": [ - "day", - "night" - ], - "night": "0.1" - }, - { - "name": "special-mushroom-fields", - "category": "animal", - "files": [ - "ambientsounds:animals.special-mushroom-fields" - ], - "volume": 0.5, - "day": 1, - "night": "0.2", - "length": { - "min": 40, - "max": 120 - }, - "pause": { - "min": 500, - "max": 2200 - } - } - ] -} diff --git a/kubejs/assets/ambientsounds/basic/regions/venus.json b/kubejs/assets/ambientsounds/basic/regions/venus.json new file mode 100644 index 000000000..4cec2093a --- /dev/null +++ b/kubejs/assets/ambientsounds/basic/regions/venus.json @@ -0,0 +1,112 @@ +{ + "name": "venus", + "bad-regions": [ + "rain" + ], + "biomes": [ + "arachnoids", + "stromatolite_beach", + "fractured_pools", + "geysers", + "salt_flats", + "sulfuric_ravine", + "fumaroles" + ], + "sounds": [ + { + "name": "cricket", + "category": "cricket_day", + "files": [ + "ambientsounds:animals.cricket", + "ambientsounds:animals.cricket2", + "ambientsounds:animals.cricket3" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.25 + }, + { + "name": "cricket-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-night", + "ambientsounds:animals.cricket-night2", + "ambientsounds:animals.cricket-night3", + "ambientsounds:animals.cricket-night4" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.05 + }, + { + "name": "cicadas", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas" + ], + "overall-raining": false, + "day": 0.15, + "night": 0.01, + "length": { + "min": 100, + "max": 300 + }, + "pause": { + "min": 100, + "max": 600 + } + }, + { + "name": "cicadas-desert", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-desert1", + "ambientsounds:animals.cicadas-desert2" + ], + "overall-raining": false, + "day": 1, + "night": 0, + "length": { + "min": 400, + "max": 900 + }, + "pause": { + "min": 500, + "max": 1000 + } + }, + { + "name": "cicadas-night", + "category": "cicadas", + "files": [ + "ambientsounds:animals.cicadas-night" + ], + "overall-raining": false, + "day": 0, + "night": 1 + }, + { + "name": "cricket-warm-night", + "category": "cricket_night", + "files": [ + "ambientsounds:animals.cricket-warm-night", + "ambientsounds:animals.cricket-warm-night2" + ], + "overall-raining": false, + "length": { + "min": 1000, + "max": 1500 + }, + "transition": 100, + "volume": 0.3 + } + ] +} diff --git a/kubejs/assets/tfg/sounds.json b/kubejs/assets/tfg/sounds.json index eaf1ad066..b6467f831 100644 --- a/kubejs/assets/tfg/sounds.json +++ b/kubejs/assets/tfg/sounds.json @@ -383,7 +383,7 @@ "ambient.mars_desert.loop": { "sounds": [ { - "name": "ambientsounds:wind/light-wind3", + "name": "ambientsounds:wind/howling-wind", "stream": true, "volume": 0.50 } @@ -445,50 +445,6 @@ "name": "minecraft:ambient/nether/soulsand_valley/sand3", "volume": 0.4, "weight": 2 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind1", - "volume": 0.3, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind1", - "pitch": 0.75, - "volume": 0.3, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind2", - "volume": 0.25, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind2", - "pitch": 0.75, - "volume": 0.3, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind3", - "volume": 0.25, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind3", - "pitch": 0.75, - "volume": 0.3, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind4", - "volume": 0.3, - "weight": 25 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind4", - "pitch": 0.75, - "volume": 0.3, - "weight": 25 } ] }, @@ -504,7 +460,7 @@ "ambient.mars_land.loop": { "sounds": [ { - "name": "ambientsounds:wind/light-wind2", + "name": "ambientsounds:animals/cicadas/cicadas-mushroom-fields", "stream": true, "volume": 0.50 } @@ -529,27 +485,27 @@ }, { "name": "minecraft:ambient/nether/basalt_deltas/click4", - "volume": 0.25, + "volume": 0.19, "weight": 20 }, { "name": "minecraft:ambient/nether/basalt_deltas/click5", - "volume": 0.25, + "volume": 0.19, "weight": 20 }, { "name": "minecraft:ambient/nether/basalt_deltas/click6", - "volume": 0.01, + "volume": 0.19, "weight": 20 }, { "name": "minecraft:ambient/nether/basalt_deltas/click7", - "volume": 0.01, + "volume": 0.19, "weight": 25 }, { "name": "minecraft:ambient/nether/basalt_deltas/click8", - "volume": 0.01, + "volume": 0.19, "weight": 25 }, { @@ -608,48 +564,9 @@ "weight": 3 }, { - "name": "minecraft:ambient/nether/soulsand_valley/wind1", - "volume": 0.3, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind1", - "pitch": 0.75, - "volume": 0.3, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind2", - "volume": 0.25, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind2", - "pitch": 0.75, - "volume": 0.3, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind3", - "volume": 0.25, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind3", - "pitch": 0.75, - "volume": 0.3, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind4", - "volume": 0.3, - "weight": 5 - }, - { - "name": "minecraft:ambient/nether/soulsand_valley/wind4", - "pitch": 0.75, - "volume": 0.3, - "weight": 5 + "name": "ambientsounds:animals/special/special-mushroom-fields", + "volume": 0.4, + "weight": 20 } ] }, diff --git a/kubejs/data/tfg/worldgen/biome/venus/beach.json b/kubejs/data/tfg/worldgen/biome/venus/beach.json deleted file mode 100644 index 807da30e9..000000000 --- a/kubejs/data/tfg/worldgen/biome/venus/beach.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "carvers": { - "air": [] - }, - "downfall": 0, - "effects": { - "sky_color": 10465603, - "fog_color": 9938052, - "water_color": 8241044, - "water_fog_color": 10866612, - "grass_color": 13758586, - "foliage_color": 11653213, - "additions_sound": { - "sound": "tfg:ambient.venus_surface.additions", - "tick_chance": 0.0111 - }, - "ambient_sound": "tfg:ambient.venus_surface.loop", - "mood_sound": { - "block_search_extent": 8, - "offset": 2, - "sound": "tfg:ambient.venus_surface.mood", - "tick_delay": 6000 - }, - "particle": { - "options": { - "type": "minecraft:ash" - }, - "probability": 0.1 - } - }, - "features": [ - [ - "tfc:erosion" - ], - [], - [], - [], - [], - [], - "#tfg:venus_veins", - "#tfg:venus_underground_decoration", - [], - [], - "#tfg:venus_top_layer_modification" - ], - "has_precipitation": true, - "spawn_costs": { - "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, - "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, - "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, - "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 - }, - "ad_astra:sulfur_creeper": { - "energy_budget": 0.2, - "charge": 0.7 - }, - "species:cliff_hanger": { - "energy_budget": 0.15, - "charge": 0.7 - } - }, - "spawners": { - "ambient": [], - "axolotls": [], - "creature": [], - "misc": [], - "monster": [ - { - "type": "endermanoverhaul:desert_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:savanna_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "endermanoverhaul:nether_wastes_enderman", - "maxCount": 1, - "minCount": 1, - "weight": 100 - }, - { - "type": "minecraft:enderman", - "maxCount": 1, - "minCount": 1, - "weight": 20 - }, - { - "type": "ad_astra:sulfur_creeper", - "maxCount": 3, - "minCount": 1, - "weight": 100 - }, - { - "type": "species:cliff_hanger", - "maxCount": 3, - "minCount": 1, - "weight": 100 - } - ], - "underground_water_creature": [], - "water_ambient": [], - "water_creature": [] - }, - "temperature": 1.6 -} \ No newline at end of file