illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2026-01-21 20:32:57 +00:00
commit 1d9b2c391a
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -347,7 +347,7 @@ jobs:
sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
- name: 📝 Cache Pakku
uses: actions/cache@v5.0.1
uses: actions/cache@v5.0.2
id: cache
with:
path: build/.cache

13
CHANGELOG.md
View file

@ -1,8 +1,21 @@
# Changelog
## Unreleased
### Important note
- OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect.
### Breaking changes we forgot to write last time
- Water wheels now *require* flowing water to work correctly. So you can't just put them in a lake, but you can make little flows off the side of it or use aqueducts and those should work.
#### Stone dusts and other rock-related changes
- Individual stone dusts for each rock type have been removed, instead being replaced with more general dusts based on rock composition. The centrifuging recipes have also been removed, though we plan on using these for something else later.
- Marble/chalk dust has been replaced with Carbonate Sedimentary dust in concrete-related recipes
- The Moon Sand in the Regolith Vapor recipe has been replaced with Asurine Dust (renewable via Rock Breaker)
- The Mars rock dusts in the Hexafluorosilic Acid recipe has been replaced with Ochrum Dust (renewable via Rock Breaker)
- Other recipe and tag unifications for consistency, like all cobbles should landslide, all slabs should be craftable the same way, etc
### Changes
- Fixed balancing issues with the Aquaponics Loop. @Redeix
### Bug fixes
- Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius
- Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix
### Translation updates
- Spanish @NikoNeko17

2
config/waves-common.toml
View file

@ -25,7 +25,7 @@ waveSpawnDistanceFromShoreMin = 4.0
waveSpriteCount = 5
#How great should the chance for waves to deposit blocks be? Lower value = higher chance.
#Range: > 1
waveBlockDepositChance = 1
waveBlockDepositChance = 1000
#How often the waves should make a sound. Higher value = rarer.
#Range: > 0
waveBreakingSoundChance = 50

23
kubejs/server_scripts/tfg/aquaponics/recipes.pisciculture.js
View file

@ -25,10 +25,10 @@ const pisciculture_base_duration = Math.max(1, greenhouse_base_duration * greenh
/** @type {DimensionIndex[]} - Dimension settings array */
const pisciculture_dimension_index = [
// Overworld settings are also used as the default when no dimension is specified.
{id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_chance: 15, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true},
{id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_chance: 15, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true},
{id: 'minecraft:overworld', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true},
{id: 'minecraft:the_nether', fluid: '#tfg:clean_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_water', eut: GTValues.VA[GTValues.LV], oxygenated: true},
// The moon has no fish yet :(
{id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_chance: 15, fluid_out: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', eut: GTValues.VA[GTValues.HV], oxygenated: null}
{id: 'ad_astra:mars', fluid: 'tfg:semiheavy_ammoniacal_water', fluid_chance: 10, fluid_out: 'tfg:nitrate_rich_semiheavy_ammoniacal_water', eut: GTValues.VA[GTValues.HV], oxygenated: null}
];
//#endregion
@ -48,11 +48,22 @@ const pisciculture_dimension_index = [
function generatePiscicultureRecipe(event, dimension, input, output, id) {
// Resolve dimension based modifier defaults by comparing to the `pisciculture_dimension_index` array.
/** @type {DimensionIndex|null} */
const dimMods = dimension ? pisciculture_dimension_index.find(d => d.id === dimension) : null;
/** @type {Internal.FluidStackIngredient_} - Resolved fluid ID or tag. Defaults to `#tfg:clean_water` */
const resolvedFluid = dimMods?.fluid ?? '#tfg:clean_water';
/** @type {Internal.FluidStackIngredient_} - Resolved aquaponic loop fluid ID or tag. Defaults to `tfg:nitrate_rich_water` */
const resolvedFluidOut = dimMods?.fluid_out ?? 'tfg:nitrate_rich_water';
/** @type {GTValues.EUt} - Resolved EUt value. Defaults to LV EUt. */
const resolvedEUt = dimMods ? dimMods.eut : GTValues.VA[GTValues.LV];
const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 5000;
/** @type {number} - Resolved fluid chance multiplied by 100. Defaults to 1000. */
const resolvedChance = dimMods ? (dimMods.fluid_chance * 100) : 1000;
/** @type {boolean|null} - Whether the recipe requires an oxygenated environment. Defaults to true. */
const requiresOxygen = dimMods ? dimMods.oxygenated : true;
// Collect errors.
@ -76,8 +87,8 @@ const pisciculture_dimension_index = [
let a = event.recipes.gtceu.pisciculture_fishery(`tfg:${id}`)
.itemInputs(input)
.perTick(true)
.chancedFluidInput(`${resolvedFluid} 5`, resolvedChance, 0)
.chancedFluidOutput(`${resolvedFluidOut} 5`, resolvedChance, 0)
.chancedFluidInput(`${resolvedFluid} 8`, resolvedChance, 0)
.chancedFluidOutput(`${resolvedFluidOut} 8`, resolvedChance, 0)
.perTick(false)
.itemOutputs(output)
.duration(pisciculture_base_duration)